Git marks the file to highlight the conflicts, and warns you if you attempt a commit without resolving the conflict. When you modify and restage the file, ...
確定! 回上一頁