/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

0 vote179 views1 answer
Open prompt with default folder ubunut
Shell/Bash
4 votes180 views1 answer
Yarn emojis
Shell/Bash
0 vote204 views1 answer
How to install scrapy-user agents
Shell/Bash
1 vote175 views1 answer
Package "ngx-mask" has an incompatible peer dependency to "@angular/common"
Shell/Bash
95 votes160 views6 answers
Docker delete all images
Shell/Bash
2 votes176 views1 answer
Yarn 2 outdated packages
Shell/Bash
0 vote176 views1 answer
Convert pem to private key openssl
Shell/Bash
3 votes187 views2 answers
Start stop restart pm2
Shell/Bash
12 votes205 views4 answers
How to update a local git repository
Shell/Bash
3 votes171 views3 answers
Brew uninstall mysql
Shell/Bash