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 -- Loïc Dachary, Artisan Logiciel Libre
Attachment:
signature.asc
Description: OpenPGP digital signature
