Re: Git merging fun and a local clone-per branch workflow

From: Date: Sat, 24 Mar 2012 15:30:36 +0000
Subject: Re: Git merging fun and a local clone-per branch workflow
References: 1 2 3 4 5  Groups: php.internals 
Request: Send a blank email to internals+get-59149@lists.php.net to get a copy of this message
24 марта 2012 г. 18:23 пользователь David Soria Parra <dsp@php.net> написал: > On 2012-03-24, Alexey Shein <confik@gmail.com> wrote: >> Hello, >> >> Just wanted to say that I updated multiple working dirs scenario here >> https://gist.github.com/2165086/, which is *much* more >> simplified now, >> thanks to dsp for hint about git-new-workdir script. >> It should work fine if all changes from downstream branches (such as >> PHP-5.3) are always merged into upstream (PHP-5.4). >> If it's not the case, then some other solution is needed. > > Can you pleae add a description like that to the php wiki ? Done. https://wiki.php.net/vcs/gitfaq#multiple_working_copies_workflow > -- > PHP Internals - PHP Runtime Development Mailing List > To unsubscribe, visit: http://www.php.net/unsub.php > -- Regards, Shein Alexey

« previous php.internals (#59149) next »