All, Just a heads up that I just finished some branch maintenance on the conductor repository, to make things absolutely clear.
1) On the next branch, I removed all of the code and added a readme file telling people that the next branch is dead and that they should develop against master instead.
2) I've done the same thing on the 0.3.0_RC1 branch. Since this is intended to be a long term maintenance branch, calling it 0.3.0_RC1 didn't make much sense. I've left the 0.3.0_RC1 tag, but deprecated the branch.
3) I've added the 0.3.x branch, which is intended for long term maintenance of the 0.3.x series of conductor.
If you are a developer working on new features, you should work against the master branch. If you are a developer working on a bugfix, you should work against the master branch, and then cherry-pick your fixes onto the 0.3.x branch as appropriate. If any of this is unclear, please talk to me, morazi, or markmc about our branching strategy.
On Thu, 2011-07-21 at 10:41 -0400, Chris Lalancette wrote:
If you are a developer working on new features, you should work against the master branch. If you are a developer working on a bugfix, you should work against the master branch, and then cherry-pick your fixes onto the 0.3.x branch as appropriate.
+1
Up until now, you've probably been doing:
$> git pull origin
and this automatically merged the upstream 'next' branch into one of your local branches.
To change it to auto-merge upstream 'master', change your .git/config:
[remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* url = ssh://git.fedorahosted.org/git/aeolus/conductor.git [branch "master"] remote = origin - merge = refs/heads/next + merge = refs/heads/master
And FWIW, I personally never do 'git pull'. If I did, I'd use one of:
$> git pull --ff-only $> git pull --rebase
git pull's default behaviour is to merge the upstream branch into your local branch. I very rarely create merge commits, so --ff-only says "only merge into my local branch if it won't create a merge commit" and --rebase says "rebase my local changes onto the remote branch".
That's all mucho confusing, so I always just use 'git fetch' and then decide whether I want to rebase onto, reset to, checkout onto a new branch or merge the changes from upstream.
Cheers, Mark.
aeolus-devel@lists.fedorahosted.org