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

git git-config mergetool
erkfel picture erkfel · Aug 23, 2013 · Viewed 7.1k times · Source

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?

Answer

John Mellor picture John Mellor · Jun 4, 2014

To permanently skip the prompt, run:

git config --global mergetool.prompt false

To skip it for a single run of git mergetool, pass -y or --no-prompt:

git mergetool -y

Related questions

How to save username and password in Git?

I want to use a push and pull automatically in GitExtension, without entering my user and password in a prompt, every time. So how can I save my credentials in git?

Read More
Is there a way to cache GitHub credentials for pushing commits?

I recently switched to synchronizing my repositories to https:// on GitHub (due to firewall issues), and it asks for a password every time. Is there a way to cache the credentials, instead of authenticating every time that git push?

Read More
How to change my Git username in terminal?

I was pushing and pulling from git in Terminal then I changed my username on github.com. I went to push some changes and it couldn't push because it was still recognizing my old username.. How do I change/update …

Read More