Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Last revision Both sides next revision | ||
git:commit-into-master [2009/04/23 10:09] andrei |
git:commit-into-master [2009/10/08 17:53] andrei |
||
---|---|---|---|
Line 4: | Line 4: | ||
If you want to push some changes you did in some other local branch, just replace // | If you want to push some changes you did in some other local branch, just replace // | ||
in //git push origin master: | in //git push origin master: | ||
+ | * first see what will be pushed | ||
+ | < | ||
+ | $ git fetch origin; git log origin/ | ||
+ | # alternatively you could try git whatchanged origin/ | ||
+ | # instead of git log and/or add --graph --color to git log / git whatchanged | ||
+ | </ | ||
- | * first try a push directly (1) | + | * try a push directly (1) |
< | < | ||
$ git push origin master: | $ git push origin master: | ||
Line 20: | Line 26: | ||
< | < | ||
+ | $ git fetch | ||
$ git pull --ff --rebase origin master | $ git pull --ff --rebase origin master | ||
</ | </ | ||
Line 50: | Line 57: | ||
</ | </ | ||
- | * 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 // |
* if when trying the rebase you get something like: | * if when trying the rebase you get something like: | ||
Line 59: | Line 66: | ||
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"// |
+ | |