Skip to content
dankelley edited this page Aug 12, 2010 · 3 revisions

Fixing an issue, using remote branches so can use more than one computer to do the work:

git checkout -b issue50
git push origin issue50
git checkout master
git branch -d issue50
git branch --track issue50 origin/master
git checkout issue50

Once it works in the branch, do

git checkout master
git merge --no-ff issue50
# test it!
git push

to get it back into master branch.

Once everything is OK, remove local and remote branches

git branch -d issue50
git push origin :heads/issue50