/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

16 votes183 views1 answer
Centos ls file size
Shell/Bash
0 vote167 views1 answer
How to start payara server
Shell/Bash
4 votes180 views1 answer
How to install davinci resolve on ubuntu
Shell/Bash
24 votes197 views6 answers
Pip3 uninstall all
Shell/Bash
0 vote194 views2 answers
Background desktop by url ubuntu
Shell/Bash
7 votes189 views1 answer
For every line in file bash
Shell/Bash
1 vote241 views1 answer
Uninstall k3s
Shell/Bash
2 votes163 views1 answer
Unix timestamp converter
Shell/Bash
0 vote213 views1 answer
What is sse flag on /proc/cpuinfo in linux
Shell/Bash
0 vote278 views1 answer
Lock symbol on files in ubuntu
Shell/Bash