我很多次都遇到了这种情况。
1. I work on master branch and make some commits
2. Then i use git pull
3. Then i get auto merge fail , conflicting changes
现在假设有5个文件存在冲突。我想知道:
1. How can i overwrite those conflicting files with my files on my commit
2. How can i overwrite those with chnages from master
在我执行 git pull 命令之后