/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

5 votes97 views2 answers
Stop npm running on port 3000
Shell/Bash
0 vote99 views1 answer
Angular cli disable auto reload
Shell/Bash
0 vote108 views1 answer
Mac shell echo command
Shell/Bash
1 vote97 views1 answer
Ganache-cli : The term 'ganache-cli' is not recognized as the name of a cmdlet, function, script file, or operable program. Check the spelling of the name, or if a path was included, verify that the path is correct and try again.
Shell/Bash
1 vote120 views2 answers
Shell get all lines that are in one file and not another
Shell/Bash
0 vote116 views2 answers
Install zip raspberry pi
Shell/Bash
6 votes102 views2 answers
Full path of file linux
Shell/Bash
5 votes93 views2 answers
How to completely uninstall android studio mac
Shell/Bash
4 votes98 views2 answers
Djanog shell change password
Shell/Bash
0 vote96 views1 answer
Sed two patterns
Shell/Bash