/Shell/Bash/Git Automatic merge failed; fix conflicts and then commit the result

Git Automatic merge failed; fix conflicts and then commit the result

$ git status

$ git add .

$ git commit -a "Comment"

How to show code conflicts in git

$ git statusOn branch masterYou 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:   merge.txt

-1

Source: atlassian.com

Similar codes

14 votes220 views4 answers
How to query mongodb with like
Shell/Bash
0 vote167 views1 answer
Module not found: Can't resolve 'http2' in
Shell/Bash
2 votes447 views2 answers
Install wget debian
Shell/Bash
36 votes248 views6 answers
Install pip in ubuntu
Shell/Bash
11 votes182 views1 answer
Remember github password global config
Shell/Bash
6 votes183 views1 answer
Zsh syntax highlighting plugin
Shell/Bash
3 votes120 views1 answer
How to sign into github from terminal
Shell/Bash
1 vote179 views2 answers
React routing not working in production
Shell/Bash
0 vote196 views1 answer
Install brain.js
Shell/Bash
0 vote225 views1 answer
Linux gzip multiple files
Shell/Bash