28 марта 2012 г. 0:18 пользователь Christopher Jones <christopher.jo...@oracle.com> написал: > > > 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.
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. I did a 'git commit -a' to resolve it. Was this the > easiest way? If 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: > > 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)? 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? -- Regards, Shein Alexey -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
