1
我使用git bash關注了git的教程,並且在輸入下面的git命令git commit
後顯示出來。我在Windows操作系統,我不能再繼續。關於git使用git bash修復衝突的教程
Merge branch 'second-branch'
# Conflicts:
# index.txt
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# modified: index.txt
~
~
~
~
任何人都可以建議接下來要做什麼?
感謝。我不知道它被稱爲vi,這實際上是我的第一個選擇,但我一直在想也許有一個適當的方式來處理它。無論如何,謝謝 – Fil