Home > git > How to use `git mergetool` to resolve conflicts

How to use `git mergetool` to resolve conflicts

https://gist.github.com/karenyyng/f19ff75c60f18b4b8149

Have the following in .gitconfig

[merge]                                                                                                                           
    tool = vimdiff  
Advertisements
Categories: git Tags: ,
  1. No comments yet.
  1. No trackbacks yet.

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out /  Change )

Google photo

You are commenting using your Google account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )

Connecting to %s

This site uses Akismet to reduce spam. Learn how your comment data is processed.

%d bloggers like this: