Re: More merge questions (why doesn't this work?)
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:14
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: More merge questions (why doesn't this work?) · Junio C Hamano <hidden>
- 2016-06-15 · Re: More merge questions (why doesn't this work?) · Sven Verdoolaege <hidden>
- 2016-06-15 · Re: More merge questions (why doesn't this work?) · Junio C Hamano <hidden>
- 2016-06-15 · Re: More merge questions (why doesn't this work?) · Sven Verdoolaege <hidden>
<linux <at> horizon.com> writes:
+ git merge 'Merge a, b, c' master a b c Trying simple merge with a Trying simple merge with b Trying simple merge with c Simple merge did not work, trying automatic merge. Removing c fatal: merge program failed No merge strategy handled the merge.
I think this is the same problem I fixed yesterday after the breakage report from Luben Tuikov. You need the ce3ca275452cf069eb6451d6f5b0f424a6f046aa commit. Sorry about that. Could you try the latest and see if it still breaks?