22 Mar
2010
22 Mar
'10
11:50 p.m.
Hi
Dne Mon, 22 Mar 2010 13:31:14 -0400 Marc Delisle marc@infomarc.info napsal(a):
Thanks Michal for the explanation. I practiced a bit. When trying a merge (I had changed just one file), I got conflict on ChangeLog.
In the ChangeLog there was an extra space on one line (just in QA_3_3), maybe this explains the previous messages.
Well this is most usual cause of merge problems - something what looks identical, but in fact is not. If there is obvious difference, it is usually quite easy to fix it.
--
Michal Čihař | http://cihar.com | http://blog.cihar.com