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 g...@git.php.net:php-src.git resource. Can you confirm this (before I update the wiki)? Thanks, Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
