Re: [PHP-DEV] Got a git merge conflict in main/output.c

2012-03-29 Thread marius adrian popa
On Thu, Mar 29, 2012 at 6:14 PM, Gustavo Lopes wrote: > On Thu, 29 Mar 2012 17:06:57 +0200, marius adrian popa > wrote: > >> 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

Re: [PHP-DEV] Got a git merge conflict in main/output.c

2012-03-29 Thread Gustavo Lopes
On Thu, 29 Mar 2012 17:06:57 +0200, marius adrian popa wrote: 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 c