有衝突沒有解決:沒有進行版本合併
You have not concluded your merge (MERGE_HEAD exists)
合併期間不能做局部的提交
fatal: cannot do a partial commit during a merge.
有衝突沒有解決:沒有進行版本合併
You have not concluded your merge (MERGE_HEAD exists)
合併期間不能做局部的提交
fatal: cannot do a partial commit during a merge.