11 Mar
2014
11 Mar
'14
3:08 a.m.
2014-03-11 3:56 GMT+01:00 Vinícius dos Santos Oliveira <vini.ipsmaker@...400...>:
But... I thought that the message was clear until I've read your email, because it seems you got wrong. Both of my repos contained commits. What caused the error was that they had no ancestors in common (both started in "commit 0"). It was just a test, then I didn't think more than one commit would be needed (they even weren't conflicting). And the messa wasn't clear at all.
I wasn't aware of that. Sounds like the message is misleading.
I can make an ascii-cast of merging using a checkout if someone is interested.
Regards, Krzysztof