Am 10.03.2015 um 00:06 schrieb Loic Dachary: > > > 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 ? It seems as if there was no change to src/gmock in hammer that is not already in master. Danny -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
