It seems the only way to resolve any conflicts you may have is to manually launch your merge tool or use your code editor to manually edit the files.
It would be handy to include a "Launch Merge Tool" button that will automatically launch your merge tool of choice (assuming that you have properly configured it with your git).
It seems the only way to resolve any conflicts you may have is to manually launch your merge tool or use your code editor to manually edit the files.
It would be handy to include a
"Launch Merge Tool"button that will automatically launch your merge tool of choice (assuming that you have properly configured it with your git).