/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

1 vote241 views1 answer
Magento 2 gulp
Shell/Bash
15 votes251 views6 answers
Wine install ubuntu
Shell/Bash
3 votes263 views2 answers
How to migrate from yarn to npm
Shell/Bash
18 votes287 views6 answers
How to install django on windows
Shell/Bash
1 vote233 views1 answer
Not digitally signed powershell
Shell/Bash
0 vote261 views1 answer
Install jira
Shell/Bash
-1 vote274 views1 answer
Install shutter ubuntu
Shell/Bash
0 vote256 views5 answers
Install mongodb debian 10
Shell/Bash
47 votes267 views6 answers
How to update node js
Shell/Bash
8 votes271 views1 answer
Find text in folder
Shell/Bash