Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59205
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.215.170 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <op.wbxtxukkidpuyk@slws007.slhq.int>
References: <CAPv8svV4aaOTEw_zNwid8MSr5KdddPe0aCEN7J27V2j-t=fp5g@mail.gmail.com>
	<op.wbxtxukkidpuyk@slws007.slhq.int>
Date: Thu, 29 Mar 2012 18:41:51 +0300
Message-ID: <CAPv8svXjG59HMVCrQ=Aqhc_g0q1_XjgDVHN0R09baD1KyRS+sg@mail.gmail.com>
To: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Cc: internals@lists.php.net
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Subject: Re: [PHP-DEV] Got a git merge conflict in main/output.c
From: mapopa@gmail.com (marius adrian popa)

On Thu, Mar 29, 2012 at 6:14 PM, Gustavo Lopes <glopes@nebm.ist.utl.pt> wro=
te:
> On Thu, 29 Mar 2012 17:06:57 +0200, marius adrian popa <mapopa@gmail.com>
> wrote:
>
>> I try to push a bug fix =A0https://bugs.php.net/bug.php?id=3D60947 for p=
hp
>> 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 b=
een
> merged (since 67bf07f). You likely forgot to pull. Do git fetch origin, g=
o
> back to 5.3, rebase onto origin/PHP-5.3 (git rebase origin/PHP-5.3) and t=
hen
> resume merging upwards (not forgetting to, before the merge, pull or merg=
e
> 5.4 and master with origin/PHP-5.4 or origin/master).
Thanks that is solved now , but now seems that i need more karma for
the ext/interbase/pdo_firebird folder

git push origin

remote: Welcome mariuz.
remote: You have insufficient Karma!
remote: I'm sorry, I cannot allow you to write to
remote:     php-src.git/ext/interbase/ibase_service.c
remote: Have a nice day.
To git@git.php.net:php-src.git
 ! [remote rejected] PHP-5.3 -> PHP-5.3 (pre-receive hook declined)
 ! [remote rejected] PHP-5.4 -> PHP-5.4 (pre-receive hook declined)
 ! [remote rejected] master -> master (pre-receive hook declined)

error: failed to push some refs to 'git@git.php.net:php-src.git'


>
> --
> Gustavo Lopes
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>