[Scummvm-devel] On using git correctly: Rebase vs. merge

[Marcus Comstedt]

Max Horn <max at quendi.de> writes:

[...]
> The topic branch then eventually is merged (and not rebased) into master, and pushed to the main repository.


And if this push fails, because someone else has managed to push
something first, the merge itself can be rebased with

  git fetch ; git rebase -p @{u}

The -p means to rebase the merge itself, rather than the merged
commits.

Of course, you could also discard the merge ("git reset --hard
HEAD^"), pull, and then do a new merge.


  // Marcus