Re: Git merging fun and a local clone-per branch workflow
| From: | Christopher Jones | Date: | Tue, 27 Mar 2012 19:18:45 +0000 |
| Subject: | Re: Git merging fun and a local clone-per branch workflow | ||
| References: | 1 2 3 4 5 6 7 8 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-59186@lists.php.net to get a copy of this message | ||
On 03/24/2012 11:17 AM, Alexey Shein wrote:
Done: https://wiki.php.net/vcs/gitfaq#multiple_working_copies_workflowI 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/