/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

8 votes178 views2 answers
Syntax Error: TypeError: this.getOptions is not a function
Shell/Bash
99 votes190 views6 answers
Kill port windows
Shell/Bash
118 votes142 views5 answers
Instal .deb ubuntu
Shell/Bash
0 vote152 views1 answer
Conda install passlib "windows"
Shell/Bash
0 vote159 views1 answer
Android ndk - configure does not recognize androideabi
Shell/Bash
0 vote139 views1 answer
How to download openssh with cmd
Shell/Bash
5 votes146 views4 answers
Restart bluetooth in ubuntu
Shell/Bash
0 vote93 views1 answer
Symbolic link wsl mnt
Shell/Bash
0 vote157 views1 answer
Replace delimiter for enter command
Shell/Bash
1 vote140 views1 answer
Set different user for git
Shell/Bash