Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59187
Return-Path: <confik@gmail.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 63090 invoked from network); 27 Mar 2012 20:16:24 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 27 Mar 2012 20:16:24 -0000
Authentication-Results: pb1.pair.com header.from=confik@gmail.com; sender-id=pass
Authentication-Results: pb1.pair.com smtp.mail=confik@gmail.com; spf=pass; sender-id=pass
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.161.170 as permitted sender)
X-PHP-List-Original-Sender: confik@gmail.com
X-Host-Fingerprint: 209.85.161.170 mail-gx0-f170.google.com  
Received: from [209.85.161.170] ([209.85.161.170:48519] helo=mail-gx0-f170.google.com)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id B2/11-04438-710227F4 for <internals@lists.php.net>; Tue, 27 Mar 2012 15:16:23 -0500
Received: by ggmb2 with SMTP id b2so298335ggm.29
        for <internals@lists.php.net>; Tue, 27 Mar 2012 13:16:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:in-reply-to:references:from:date:message-id:subject:to
         :cc:content-type:content-transfer-encoding;
        bh=q87MZIyK7LQ8JfNbDgzyFuRgiELEX7lZC0yL0XRi/nc=;
        b=vJDjjPtRZd8NrpX96T6xuUnxTZTMrWLK3FPfllrOSXQ4Ig3I2mi5nPqF93lRM/bHXm
         sVgIdkjEPdULrKn+C6vdYl/hxqGrchDqPICzPuvom5hY4IPZU3p/f2a1NHvpjKP9L3pD
         BIyoGWjUdCVbYdNOsltcnbIl1s5fi5ojgHkk8cSilHed4INpeKlT0JaDLFd6z4CO7G1U
         y3HERVEz4061T2rcYiPuImEecS3CvHC/t4PEkHn20L28bcZJ2eUi+duuEOJ7QOJN2s2V
         sjgiAjW5sOxnSReGuDdxx8Zj/8chxu/fgJh6bkaf/+03onEdouM7z1M7yD97nd+FTDJj
         4IFQ==
Received: by 10.236.161.73 with SMTP id v49mr27047049yhk.89.1332879380663;
 Tue, 27 Mar 2012 13:16:20 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.101.213.40 with HTTP; Tue, 27 Mar 2012 13:16:00 -0700 (PDT)
In-Reply-To: <4F721295.5070400@oracle.com>
References: <4F6BB4AA.2090208@oracle.com> <CAGSj+Qs8M+VNSO4aQcn5F4cjfH1NWa7hvc5tHB9NWDypzx_1Xw@mail.gmail.com>
 <4F6BC462.6060001@oracle.com> <CAAAa2sgfP=qDSPMms4XrujMSL4yy+=sq0wyHDwz1sh7Ba=R3DQ@mail.gmail.com>
 <slrnjmrim4.g88.dsp@experimentalworks.net> <CAAAa2sgze4hqNcAggRAQuB6me+XKdxNhXTC=UgYvU__Wgg2UOQ@mail.gmail.com>
 <4F6DF06F.3040104@oracle.com> <CAAAa2shnC33ynquYiycCwcfxO5Ew_KbaAOGw+TK+G4dwk=Hu5g@mail.gmail.com>
 <4F721295.5070400@oracle.com>
Date: Wed, 28 Mar 2012 01:16:00 +0500
Message-ID: <CAAAa2sipnaJPkotLHt5N+CYwtDERp0KhnsziDu-pbKwHdGuryA@mail.gmail.com>
To: Christopher Jones <christopher.jones@oracle.com>
Cc: PHP Developers Mailing List <internals@lists.php.net>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [PHP-DEV] Git merging fun and a local clone-per branch workflow
From: confik@gmail.com (Alexey Shein)

28 =D0=BC=D0=B0=D1=80=D1=82=D0=B0 2012=C2=A0=D0=B3. 0:18 =D0=BF=D0=BE=D0=BB=
=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C Christopher Jones
<christopher.jones@oracle.com> =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BB:
>
>
> On 03/24/2012 11:17 AM, Alexey Shein wrote:
>
>> Done: https://wiki.php.net/vcs/gitfaq#multiple_working_copies_workflow
>
>
> I tried it out today. =C2=A0It mostly went smoothly.

Hi! Glad to hear that.

> Because of differing file contents in the branches (from my merge
> attempts last week) I had to resolve conflicts when merging to
> ~/php-src. =C2=A0I did a 'git commit -a' to resolve it. Was this the
> easiest way? =C2=A0If so I will add it to the workflow.

This is the common technique afaik. If you get the conflict, you
should resolve it somehow (manually or using some merge tools), after
that to get know git about you're done, use
$ git add <files with conflicts>
Be sure to resolve all conflicts, watch out <<<<< and >>>> strings in
conflicted files, there shouldn't be any.
$ git commit -m 'Resolved merging conflict'

Generally, resolving conflicts in public branches is not a good idea.
You'll get very messy branch history. Instead, you should resolve
conflicts when rebasing your own private branches against up-to-date
public ones. This way your branch becomes "a patch to repository HEAD"
which is very clean and nice to see.

> When pushing I got:
>
> =C2=A0error: Cannot access URL https://git.php.net/repository/php-src.git=
/,
> return code 22
>
> This was resolved after doing:
>
> =C2=A0cd ~/php-src
> =C2=A0git config remote.origin.pushurl https://git.php.net/push/php-src.g=
it/
>
> We were having chronic firewall failures while I was doing this, but I
> believe the above pushurl solved this particular issue. =C2=A0I guess the
> wording "These both are push-urls" only really applies to the
> git@git.php.net:php-src.git resource. =C2=A0Can you confirm this (before =
I
> update the wiki)?

Yes, it seems I messed up with those http urls.
https://git.php.net/repository/php-src.git - is read-only
https://git.php.net/push/php-src.git/ - is push-only

So you've done everything right, sorry for confusion. Could you update
the wiki, please?
--=20
Regards,
Shein Alexey