Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
rb:git-cheatsheet [20/05/2019 09:42]
andrew [git branch]
rb:git-cheatsheet [11/06/2019 12:54] (current)
andrew [git status]
Line 346: Line 346:
 config@server1:​~/​repo1$ config@server1:​~/​repo1$
 </​code>​ </​code>​
 +
 +
 +==== git rebase ====
 +
 +Use this to merge updates/​changes in Master to local branch.
 +
 +<code git>
 +git status
 +git checkout master
 +git pull
 +git checkout ajs/​branchName
 +git rebase origin/​master
 +git status
 +
 +Resolve any conflicts here. Add changed files again.
 +
 +git depermission.py ​
 +git status
 +git rebase --continue
 +</​code>​
 +
  
  

rb/git-cheatsheet.txt ยท Last modified: 11/06/2019 12:54 by andrew