Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
|
git:commit-into-master [2009/04/23 10:14] andrei |
git:commit-into-master [2009/07/21 14:31] andrei more options for dealing with local changes |
||
|---|---|---|---|
| Line 20: | Line 20: | ||
| < | < | ||
| + | $ git fetch | ||
| $ git pull --ff --rebase origin master | $ git pull --ff --rebase origin master | ||
| </ | </ | ||
| Line 50: | Line 51: | ||
| </ | </ | ||
| - | * if you get a merge conflict then fix-it and proceed as instructed (edit the file with the conflict, use git add < | + | |
| **NOTE:** you could update your branch (3) also with //git pull --ff// (no // | **NOTE:** you could update your branch (3) also with //git pull --ff// (no // | ||
| Line 59: | Line 60: | ||
| refusing to pull with rebase: your working tree is not up-to-date | refusing to pull with rebase: your working tree is not up-to-date | ||
| </ | </ | ||
| - | it means you have some uncomitted local changes. Commit them (//git add ...// && //git commit//) and try again. | + | it means you have some uncomitted local changes. Commit them (//git add ...// && //git commit//) or save them for latter use/review (//git stash save "local changes"// |
| + | | ||
