28 марта 2012 г. 0:18 пользователь 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.
Hi! Glad to hear that.
> Because of differing file con
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
On 3/24/12 11:17 AM, Alexey Shein wrote:
Nice work Alexey.
Can you expand on the "if necessary" part of the setting the
pushurl?
I removed that part and added some explanation about clone urls in the
beginning. Since this workflow is generally for core devs ssh/https
are read/write so you don
> Nice work Alexey.
>
> Can you expand on the "if necessary" part of the setting the
> pushurl?
I removed that part and added some explanation about clone urls in the
beginning. Since this workflow is generally for core devs ssh/https
are read/write so you don't need separate setting push-urls.
>
On 3/24/12 8:30 AM, Alexey Shein wrote:
24 марта 2012 г. 18:23 пользователь David Soria Parra написал:
On 2012-03-24, Alexey Shein 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,
than
24 марта 2012 г. 18:23 пользователь David Soria Parra написал:
> On 2012-03-24, Alexey Shein 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-n
On 2012-03-24, Alexey Shein 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
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 i
On 03/22/2012 05:09 PM, Kiall Mac Innes wrote:
Right - `git diff` shows the different between HEAD (The last commit
of the branch your are currently on) and what you have yet to
commit.
I was doing the diffs compared with the origin/* branches, as shown in
the gist, https://gist.github.com/21
On Thu, Mar 22, 2012 at 11:24 PM, Christopher Jones <
christopher.jo...@oracle.com> wrote:
> 1. I had fun with a couple of small git merges today. I was trying to
> use local clones as briefly outlined on irc by dsp.
Multiple clones for each branch will be *much **much* harder to manage from
1. I had fun with a couple of small git merges today. I was trying to
use local clones as briefly outlined on irc by dsp. The goal is to
have different local directories for each of the three branches:
5.3, 5.4 and 'trunk'. The resulting pushes I made today are a
little strange and
11 matches
Mail list logo
