dereklam0528 Posted June 17, 2021 Report Share Posted June 17, 2021 (edited) Hello all, I am trying to merge my branch into my main branch, but this warning shows up. How can I fix this? Update: never mind. I went to the preference and change the merge tool. And fixed this issue.... Case closed. Edited June 17, 2021 by dereklam0528 Case closed Link to comment Share on other sites More sharing options...
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!Register a new account
Already have an account? Sign in here.Sign In Now