[Scummvm-devel] BADA port git push

[Marcus Comstedt]

Chris Warren-Smith <cwarrensmith at gmail.com> writes:

> $ git branch initial-bada-port remotes/upstream/branch-1-3-0
> $ git checkout initial-bada-port
>
> ... manually merge my changes including suggestions from lordhoto


If you don't want to toss all the history, but only some parts of it,
you can do this instead:

$ git branch initial-bada-port your-old-branch
$ git checkout initial-bada-port
$ git rebase -i remotes/upstream/branch-1-3-0

This will automatically remove any merge commits (failed or not), and
you can then manually remove or squish additional commits you do not want
before the changes are applied to the 1-3-0 branch.

Either way, you'll want to diff the result to both your old branch
(to see that you didn't miss any changes which were actually
important) and to 1-3-0 (to see that you didn't include something
which wasn't) before pushing.


  // Marcus