gitgit-configmergetool

How to skip "Hit return to start merge resolution tool" and open mergetool automatically

Git asking to hit return button to open the mergetool for each conflict file one by one:

> git mergetool 
Normal merge conflict for '...':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (opendiff):

How can I avoid the hitting return step for my project and just open the configured merge tool automatically?

Solution

  • Use the -y flag. From the documentation:

    -y
    --no-prompt
    Don’t prompt before each invocation of the merge resolution program.