[Phpmyadmin-devel] committing a patch to git

[Michal Čihař]

Hi

Dne Mon, 22 Mar 2010 13:31:14 -0400
Marc Delisle <marc at 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20100322/bb6dc3b6/attachment.sig>