/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 vote238 views1 answer
Git show files that are not tracked
Shell/Bash
1 vote185 views1 answer
Deactivate laptop keyboard ubuntu
Shell/Bash
0 vote187 views1 answer
Get the latest from remote git
Shell/Bash
0 vote172 views2 answers
Git diff exclude file
Shell/Bash
1 vote164 views1 answer
Can i go back to bash from zsh mac
Shell/Bash
0 vote182 views1 answer
Install Inkscape 1.x manager ubuntu
Shell/Bash
3 votes165 views1 answer
Lua reverse shell
Shell/Bash
0 vote164 views1 answer
Groupadd to folder linux fedora
Shell/Bash
4 votes185 views1 answer
Bash watch cpu frequency, linux cpu frequency, linux live cpu frequency
Shell/Bash
0 vote197 views1 answer
The current application is not compatible with NativeScript CLI 8.0.2
Shell/Bash