Skip to content

Instantly share code, notes, and snippets.

Created November 10, 2011 05:02
Show Gist options
  • Save anonymous/1354160 to your computer and use it in GitHub Desktop.
Save anonymous/1354160 to your computer and use it in GitHub Desktop.
bug in git
git init gitbug
cd gitbug/
mkdir test
echo "hi" > test/test.txt
git add .
git commit -am "initial revision"
git checkout -b branch1
git mv test/ test2
git commit -am "renamed test to test2"
git checkout master
echo "change on master" >> test/test.txt
git commit -am "made a change on master"
git checkout branch1
echo "change on branch1" >> test2/test.txt
git merge master
cat test2/test.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment