我有一個回購主,我FILE1.TXT和FILE2.TXT做我何不讓Git之後提交合並
git checkout -b fix1
我再改FILE1.TXT
而我呢一個
git commit -a
然後我做了
git checkout master
然後我做了
git checkout -b fix2
我再改FILE2.TXT
,我做了
git commit -a
然後git checkout master
然後
git merge fix1
git marge fix2
,但如果我做了
commit -a
我得到
# On branch master nothing to commit (working directory clean)