Re: Got a git merge conflict in main/output.c

From: Date: Thu, 29 Mar 2012 15:14:08 +0000
Subject: Re: Got a git merge conflict in main/output.c
References: 1  Groups: php.internals 
Request: Send a blank email to internals+get-59203@lists.php.net to get a copy of this message
On Thu, 29 Mar 2012 17:06:57 +0200, marius adrian popa <mapopa@gmail.com> 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 conflicts and then commit the result.
The 5.3 specific commit was left unmerged for a while, but it's already been merged (since 67bf07f). You likely forgot to pull. Do git fetch origin, go back to 5.3, rebase onto origin/PHP-5.3 (git rebase origin/PHP-5.3) and then resume merging upwards (not forgetting to, before the merge, pull or merge 5.4 and master with origin/PHP-5.4 or origin/master). -- Gustavo Lopes

« previous php.internals (#59203) next »