Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59186 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 58654 invoked from network); 27 Mar 2012 19:18:55 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 27 Mar 2012 19:18:55 -0000 Authentication-Results: pb1.pair.com smtp.mail=christopher.jones@oracle.com; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=christopher.jones@oracle.com; sender-id=unknown Received-SPF: error (pb1.pair.com: domain oracle.com from 141.146.126.227 cause and error) X-PHP-List-Original-Sender: christopher.jones@oracle.com X-Host-Fingerprint: 141.146.126.227 acsinet15.oracle.com Received: from [141.146.126.227] ([141.146.126.227:32927] helo=acsinet15.oracle.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 43/70-04438-C92127F4 for ; Tue, 27 Mar 2012 14:18:53 -0500 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q2RJIlZT017962 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 27 Mar 2012 19:18:48 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q2RJIkA9021591 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 27 Mar 2012 19:18:47 GMT Received: from abhmt119.oracle.com (abhmt119.oracle.com [141.146.116.71]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q2RJIkEP032697; Tue, 27 Mar 2012 14:18:46 -0500 Received: from [130.35.70.154] (/130.35.70.154) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 27 Mar 2012 12:18:46 -0700 Message-ID: <4F721295.5070400@oracle.com> Date: Tue, 27 Mar 2012 12:18:45 -0700 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:10.0) Gecko/20120129 Thunderbird/10.0 MIME-Version: 1.0 To: Alexey Shein , PHP Developers Mailing List References: <4F6BB4AA.2090208@oracle.com> <4F6BC462.6060001@oracle.com> <4F6DF06F.3040104@oracle.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Source-IP: ucsinet21.oracle.com [156.151.31.93] X-CT-RefId: str=0001.0A090204.4F721298.004D,ss=1,re=0.000,fgs=0 Subject: Re: [PHP-DEV] Git merging fun and a local clone-per branch workflow From: christopher.jones@oracle.com (Christopher Jones) 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. It mostly went smoothly. Because of differing file contents in the branches (from my merge attempts last week) I had to resolve conflicts when merging to ~/php-src. I did a 'git commit -a' to resolve it. Was this the easiest way? If so I will add it to the workflow. When pushing I got: error: Cannot access URL https://git.php.net/repository/php-src.git/, return code 22 This was resolved after doing: cd ~/php-src git config remote.origin.pushurl https://git.php.net/push/php-src.git/ We were having chronic firewall failures while I was doing this, but I believe the above pushurl solved this particular issue. I guess the wording "These both are push-urls" only really applies to the git@git.php.net:php-src.git resource. Can you confirm this (before I update the wiki)? Thanks, Chris -- Email: christopher.jones@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/