On Mon, Apr 16, 2012 at 12:44:56AM -0700, tombert wrote:
> Only the differences are stored - that is understood ...
> but I don't think that this solves my problem:
> B - D - E (several files changed)
> C - F (only one file makes the difference to the B branch)
> So what is the best way of getting the changes D and E into my C branch?
$ git checkout C
$ git merge -s ours B
1) Git has no problems with repeated merges, so you can perform this
kind of merging any time you see fit.
2) The "ours" merge strategy makes sure that your changes always
trump the changes being merged.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to firstname.lastname@example.org.
To unsubscribe from this group, send email to
For more options, visit this group at