Created
November 10, 2011 05:02
-
-
Save anonymous/1354160 to your computer and use it in GitHub Desktop.
bug in git
This file contains hidden or 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 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