Subject: Re: Challenges for an octopus merge

From: Markus Elfring <[email-masked]>
Date: Sat, 12 Feb 2011 05:50:16 +0100

> The user needs to decide what to do next; the user may choose to do "git merge A C ; git merge B" instead,
> but *after* inspecting the situation.

I have inspected my situation a bit more. I hope that the merging process can be 
improved so that it can cope with my update suggestions here.

Would anybody (besides me) like to look into the affected patches and source 
files if the tool "Git" can provide a better service?

Does it make sense to add these files to your test-suite?

Regards,
Markus