Got a git merge conflict in main/output.c
| From: | marius adrian popa | Date: | Thu, 29 Mar 2012 15:06:57 +0000 |
| Subject: | Got a git merge conflict in main/output.c | ||
| Groups: | php.internals | ||
| Request: | Send a blank email to internals+get-59202@lists.php.net to get a copy of this message | ||
I try to push a bug fix https://bugs.php.net/bug.php?id=60947 for php
into 5.4 and trunk
git merge --no-ff --log PHP-5.3
Auto-merging main/output.c
CONFLICT (content): Merge conflict in main/output.c
Automatic merge failed; fix conflicts and then commit the result.