|
|
|
|
|
|
by Hello71
1772 days ago
|
|
|
> If "git pull --rebase" succeeds without reporting a merge conflict, then it's tantamount to having executed the command with "--ff-only". this is not correct. git rebase, as with git merge, will automatically resolve conflicts using a 3-way merge algorithm. > It will only ever modify your local this is correct. > unpublished commits this is not correct. git rebase (in its default mode) rebases all commits that are not upstream onto the upstream. it has nothing to do with whether they are published or not. if you have a published feature branch, and git pull --rebase into it, git rebase will dutifully rebase all your commits. |
|
|