Search
 
SCRIPT & CODE EXAMPLE
 
CODE EXAMPLE FOR SHELL

Automatic merge failed; fix conflicts and then commit the result.

git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt false
Source by stackoverflow.com #
 
PREVIOUS NEXT
Tagged: #Automatic #merge #fix #conflicts #commit
ADD COMMENT
Topic
Name
1+8 =