Re: Merging hammer in master: conflict on gmock

[Loic Dachary <loic@dachary.org>]

[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]



On 09/03/2015 18:31, Danny Al-Gaaf wrote:
> Hi Loic,
> 
> this one is a tricky one. I didn't find a smooth/automatic solution yet.
> 
> This seems to work:
> 
> git checkout master
> git merge --no-ff origin/hammer
> git mergetool
>  -> for the conflict: select 'local' for src/gmock (this should keep
>     the changes im master and ignore changes from hammer)

Do you know what changes have been done in hammer in src/gmock ?

> git commit
> 
> You may have to check if the result is what's intended.
> 
> Danny
> 
> Am 09.03.2015 um 15:18 schrieb Loic Dachary:
>> Hi Danny,
>>
>> As of now, git checkout master ; git merge origin/hammer gets a 
>> conflict on gmock
>>
>> When we last discussed it you found that git merge -m 1 was a 
>> solution. But I'm not sure I fully understand the consequences.
>>
>> Cheers
>>
> 
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 
Loïc Dachary, Artisan Logiciel Libre


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]