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
Hi Danny,
On 10/03/2015 06:59, Danny Al-Gaaf wrote:
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
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
signature.asc
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)
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
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
