Skip to content

Instantly share code, notes, and snippets.

@insidenothing
Created November 29, 2010 21:31
Show Gist options
  • Save insidenothing/720662 to your computer and use it in GitHub Desktop.
Save insidenothing/720662 to your computer and use it in GitHub Desktop.
The basic on how to branch.
Review:
At this point you should have a local copy of the master, up to date.
Create the branch, push it, use it
$ git branch nightly
$ git push [git@github.com:...] nightly
$ git checkout nightly
(work your files)
$ git commit -a
$ git push [git@github.com:...] nightly
-----------------------------------
Merge Instructions
$ git checkout master
$ git merge nightly
( fix any conflicts )
$ git commit -a
$ git push [git@github.com:...] master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment