January 23, 2010

01/23, @5:12pm:

Since thursday, the Limonade github fork queue seems to be broken (or something’s wrong with GitHub). But I wanted to apply Colin’s last commit before working on the project today.

So, I followed this article and finally, it was very easy.

# Setup repo as a remote branch
git remote add -f cbrumelle git://github.com/cbrumelle/limonade.git

# Create the local copy
git checkout -b cbrumelle/0.5

# Get their changes into my personal working branch:
git checkout 0.5
git cherry-pick 6f556e7 # <hash of user's specific changes that they requested you to pull>

Then I clean up my project by removing Colin’s branches (maybe there’s a nicer way to do that):

# First I list my branches
git branch -a

# this is the output:
  0.4
* 0.5
  cbrumelle/0.5
  master
  remotes/cbrumelle/0.4
  remotes/cbrumelle/0.5
  remotes/cbrumelle/master
  remotes/origin/0.4
  remotes/origin/0.5
  remotes/origin/master

# Then I delete the local copy
git branch -d cbrumelle/0.5

# And the remote ones
git branch -r -d cbrumelle/0.4
git branch -r -d cbrumelle/0.5
git branch -r -d cbrumelle/master

# finally remove remote repository reference
git remote rm cbrumelle

Notes:

blog comments powered by Disqus