/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

75 votes154 views2 answers
Httpie on windows
Shell/Bash
3 votes152 views4 answers
Git unstage a file
Shell/Bash
-1 vote170 views2 answers
Npm install production
Shell/Bash
38 votes145 views5 answers
How to install dotenv
Shell/Bash
1 vote160 views1 answer
Docker-machine install mac brew
Shell/Bash
0 vote153 views1 answer
Nohup run node/npm
Shell/Bash
0 vote150 views2 answers
Difference between - and -- in linux
Shell/Bash
0 vote181 views1 answer
Install atom ubuntu 18
Shell/Bash
32 votes140 views5 answers
Matplotlib install
Shell/Bash
0 vote153 views1 answer
Apt update one package
Shell/Bash