/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

61 votes242 views6 answers
Kill port in mac
Shell/Bash
0 vote236 views1 answer
Grep and
Shell/Bash
2 votes223 views1 answer
Adb command to change screen refresh rate
Shell/Bash
15 votes204 views2 answers
Laravel install ui bootstrap with auth
Shell/Bash
2 votes223 views3 answers
How to run sublime from terminal
Shell/Bash
1 vote201 views1 answer
Cannot retrieve metalink for repository: epel/i386. Please verify its path and try again
Shell/Bash
3 votes228 views4 answers
Git diff files only
Shell/Bash
0 vote228 views1 answer
Rails reset gemfile.lock
Shell/Bash
1 vote226 views1 answer
Mac of hide "upgrade now"
Shell/Bash
0 vote209 views1 answer
Conda install netcdf4
Shell/Bash