Created
June 21, 2013 10:23
-
-
Save forsvunnet/5830315 to your computer and use it in GitHub Desktop.
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
#Make a new branch: | |
gco -b new_branch | |
#do bunch of changes | |
ga -A | |
gc -m "Made a bunch of changes" | |
#checkout master | |
gco master | |
#get the latest updates to master | |
gl | |
#Go back to new_branch or whatever you called it | |
gco new_branch | |
#Check diffs: | |
gd --stat master | cat - | |
#Attempt a merge (merges master into new_branch) | |
g merge master | |
#lots of merge conflicts: | |
g mergetool |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment