/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 vote268 views1 answer
Find and kill android device offline on Mac
Shell/Bash
11 votes244 views6 answers
E: Could not get lock /var/lib/dpkg/lock-frontend - open (11: Resource temporarily unavailable) E: Unable to acquire the dpkg frontend lock (/var/lib/dpkg/lock-frontend), is another process using it?
Shell/Bash
3 votes329 views2 answers
Add local project to bitbucket
Shell/Bash
3 votes264 views1 answer
Linux auto shutdown
Shell/Bash
2 votes274 views3 answers
Remove heroku remote
Shell/Bash
1 vote291 views4 answers
Enable ssh on ubuntu 20.04
Shell/Bash
1 vote253 views1 answer
Copy file to docker conatiner using docker dockerfile
Shell/Bash
0 vote303 views2 answers
Sticky notes for ubuntu 20.04
Shell/Bash
21 votes227 views3 answers
Save and quit keys vim
Shell/Bash
0 vote267 views1 answer
Uninstall gitlab-ee
Shell/Bash