Created
October 21, 2011 16:39
-
-
Save sumardi/1304290 to your computer and use it in GitHub Desktop.
Basic branching & merging
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git branch experimental | |
$ git branch | |
$ git checkout experimental | |
(edit file) | |
$ git commit -a | |
$ git checkout master | |
(edit file) | |
$ git commit -a | |
$ git merge experimental | |
$ git diff | |
$ git commit -a | |
$ gitk | |
$ git branch -d experimental |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment