/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

21 votes201 views2 answers
Brew.sh
Shell/Bash
0 vote180 views1 answer
Git raname file
Shell/Bash
0 vote282 views1 answer
My ubuntu software center has disppeared
Shell/Bash
1 vote258 views2 answers
Chrome update ubuntu 20.04
Shell/Bash
0 vote217 views1 answer
Split disk image dmg
Shell/Bash
2 votes185 views1 answer
Tail grep
Shell/Bash
2 votes205 views1 answer
Install vm guest additions ubuntu
Shell/Bash
0 vote190 views1 answer
Bluetooth keep restarting ubuntu
Shell/Bash
0 vote219 views1 answer
Debian sudo without password
Shell/Bash
0 vote179 views1 answer
K8s rollout
Shell/Bash