14 Sep
2011
14 Sep
'11
3:51 p.m.
On Tuesday 13 September 2011, Daniel-Constantin Mierla wrote:
not a git expert, but if you tried to merge the branches, looks like it failed. You can do 'git diff' and see if you have parts in between '<<<', '===' and '>>>'. If yes, you can resolve manually by deleting the invalid parts and the delimiters of the parts, then 'git add' the conflict files and commit.
Hi,
AFAIK there is also a GUI frontend, it can be called with 'git mergetool'. Maybe its easier this way.
Best regards,
Henning