Re: Merging hammer in master: conflict on gmock

[Danny Al-Gaaf <danny.al-gaaf@bisect.de>]

Am 10.03.2015 um 09:02 schrieb Loic Dachary:
> Hi Danny,
> 
> On 10/03/2015 06:59, Danny Al-Gaaf wrote:
>> Am 10.03.2015 um 00:06 schrieb Loic Dachary:
[...]
>>> 
>>> Do you know what changes have been done in hammer in src/gmock
>>> ?
>> 
>> It seems as if there was no change to src/gmock in hammer that
>> is not already in master.
> 
> After the set of commands you suggest, how could we make sure
> nothing was trashed or unintentionally included ? I can't think of
> a sure method from the top of my head.

Since these commands only trash/ignore the changes to src/gmock from
the hammer branch. And I guess there will be nothing for this
directory we need to merge back to master.

In fact the merge conflict is not about commits AFAICS but about the
change in master from inline to submodule code.

One possibility would always be to extract the patches from hammer
(git checkout hammer && git format-patch master), and check after the
merge if one is missing (e.g. run 'git am' until you have a patch that
can be applied).

I know this is not ideal ... IMO git is missing an automated way to
handle these kind of merge conflict.

Danny