You can use the http://git-scm.com/docs/git-mergetool command to invoke an external merge tool. Here is one example how to set up Vim as an external mergetool: http://www.rosipov.com/blog/use-vimdiff-as-git-mergetool/ and I'm assuming that you can find other examples for the merge tool of your choice.
On October 21st, 2020 we hosted a webinar titled, Step Up You DevOps Game with 4 Key Integrations for Jira and Bitbucket. We had a great showing and high engagement, but that meant th...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events