Skip to content

Instantly share code, notes, and snippets.

@chalstrick

chalstrick/testMerge.sh

Created February 3, 2017 08:23
Show Gist options
  • Save chalstrick/90950f6f90a3ac70e1948aa77a71ab0b to your computer and use it in GitHub Desktop.
Save chalstrick/90950f6f90a3ac70e1948aa77a71ab0b to your computer and use it in GitHub Desktop.
Download ZIP
Raw
testMerge.sh
touch a b c
git add a b c
git commit -m init
git branch side
echo master >a
git commit -a -m m1
git checkout side
echo side >b
git commit -a -m s1
git merge --no-commit master
echo merge >c
git commit -a -m merge
git show
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment