/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

12 votes142 views3 answers
Pycharm community install ubuntu
Shell/Bash
0 vote127 views1 answer
Kill occupation port windows
Shell/Bash
0 vote117 views1 answer
Install pgcli linux
Shell/Bash
0 vote75 views1 answer
Install ansible
Shell/Bash
26 votes114 views5 answers
Install vlc on ubuntu
Shell/Bash
0 vote104 views1 answer
Bind mount on linux
Shell/Bash
0 vote112 views1 answer
How to format pendrive on ubuntu
Shell/Bash
8 votes110 views2 answers
Linux chown
Shell/Bash
0 vote142 views1 answer
Mpeg-4 aac decoder plugin for linux download
Shell/Bash
3 votes110 views1 answer
Publish pypi
Shell/Bash