On 09/27/2012 11:25 PM, Jérôme Loyet wrote:
laurence: I know, sorry, but merging never works gently. Each time, I'm in a situation from which I can never exit cleanly. I spend more time dealing with git than working on the patch ... you can easly understand I'm not continuing this way :( for me, it's a pain in the ass since php sources have been migrated to git. if you have a clean and simple solution: I'm all ears :)
Look at the "Multiple working copies workflow" on https://wiki.php.net/vcs/gitfaq Chris -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
