/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 vote123 views1 answer
Git replace branch with another
Shell/Bash
0 vote108 views1 answer
Git howto
Shell/Bash
0 vote109 views1 answer
How to set path variable in linux temporarily?
Shell/Bash
0 vote104 views1 answer
Reinstall settings app ubuntu
Shell/Bash
0 vote107 views1 answer
Ubuntu list compillers
Shell/Bash
0 vote110 views1 answer
Pm2 process disappears after reboot
Shell/Bash
0 vote111 views1 answer
Hadoop distcp diff snapshot
Shell/Bash
0 vote112 views1 answer
Stack over flow mongodb exit code 48
Shell/Bash
5 votes106 views6 answers
Laravel create project
Shell/Bash
0 vote125 views1 answer
Install wp from wp-cli
Shell/Bash