/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 vote253 views1 answer
How to install bwa in ubuntu
Shell/Bash
0 vote275 views1 answer
Git ajouter tous les fichiers
Shell/Bash
2 votes288 views1 answer
Cp folders
Shell/Bash
-1 vote261 views2 answers
React-helmet typescript
Shell/Bash
0 vote252 views1 answer
Install couchdb ubuntu 18.04
Shell/Bash
0 vote271 views2 answers
Powershell list services filter
Shell/Bash
0 vote271 views1 answer
Docker wsl2 vmmem
Shell/Bash
0 vote283 views1 answer
Nginx file permission
Shell/Bash
1 vote255 views1 answer
Locate command not found
Shell/Bash
0 vote274 views1 answer
Install rtools rstudio
Shell/Bash