Re: [Jack-Devel] JACK2 branching

Prev	Next Index
Date	Sun, 10 Apr 2011 18:55:01 +0300
From	Nedko Arnaudov <[hidden] at arnaudov dot name>
To	Stéphane Letz <[hidden] at grame dot fr>
Cc	[hidden] at lists dot jackaudio dot org
In-Reply-To	Nedko Arnaudov Re: [Jack-Devel] JACK2 branching

Nedko Arnaudov <[hidden]> writes:

> Nedko Arnaudov <[hidden]> writes:
>
>> git stash # ensure there are no uncommited changes
>> git checkout master
>> git svn fetch
>> git rebase trunk
>> git checkout pipelining
>> git merge master -m "merge svn trunk rNNNN"
>> git push trunk master pipelining
>
> the last command should be:
> git push cz trunk master pipelining
>
> and before getting new commits from git-svn, one should try get them
> From the git repo, i.e. "git fetch cz" before "git svn fetch"

and after fetching new commits from the public git repo, the local
master branch has to be updated with the new commits. For example like
this:

git merge --ff-only cz/master

I've updated the wiki page.

-- 
Nedko Arnaudov <GnuPG KeyID: 7862B9E45D1B58ED>

Prev	Next Index

1302450930.23471_0.ltw:2,a <87bp0eayp6.fsf at nuntu dot spacelabs dot org>