/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

3 votes154 views1 answer
Clean uninstall ubuntu-desktop from ubuntu server
Shell/Bash
10 votes131 views2 answers
Github adding images to readme
Shell/Bash
6 votes176 views2 answers
Find ssh key windows
Shell/Bash
0 vote335 views1 answer
“Permission denied while trying to connect to the Docker daemon socket” while accessing docker image on jenkins
Shell/Bash
16 votes147 views6 answers
Pip install pandas
Shell/Bash
0 vote145 views1 answer
Shell loop terminating after command
Shell/Bash
2 votes165 views1 answer
How to open gedit using terminal
Shell/Bash
0 vote145 views1 answer
Laravel install lysystem-aws-s3
Shell/Bash
0 vote181 views1 answer
Como crear icono de aplicacion en linux
Shell/Bash
0 vote144 views1 answer
Nginx file permission
Shell/Bash