$ git merge dev
Auto-merging readme.txt
CONFLICT (content): Merge conflict in readme.txt
Automatic merge failed; fix conflicts and then commit the result.
10121@LAPTOP-Q8DVQKD0 MINGW64 /d/learngit (master|MERGING)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: readme.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
gitskills/
no changes added to commit (use "git add" and/or "git commit -a")
第二十二军规
我新建了一个dev分支,切回master分支后,用git merge dev来合并dev和master分支,结果失败了。是因为我在master里面也修改过readme.txt,并且没有commit,然后我在dev又修改过readme.txt,commit了,然后合并的时候git不知道应该怎么合并(不知道该采用哪种修改吗?)