Jump to content

Error on merging branch to main


Recommended Posts

Hello all,

I am trying to merge my branch into my main branch, but this warning shows up. How can I fix this?

Screenshot 2021-06-17 at 08.35.53.png


Update: never mind. I went to the preference and change the merge tool. And fixed this issue.... Case closed.

Edited by dereklam0528
Case closed
Link to comment
Share on other sites

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

Sign in

Already have an account? Sign in here.

Sign In Now
  • Create New...