Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

External conflict merge tool support. #783

Closed
Lochemage opened this issue Sep 5, 2016 · 1 comment
Closed

External conflict merge tool support. #783

Lochemage opened this issue Sep 5, 2016 · 1 comment

Comments

@Lochemage
Copy link
Contributor

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).
@Lochemage Lochemage mentioned this issue Sep 5, 2016
Merged
@Lochemage
Copy link
Contributor Author

A fix for this has been merged in.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@Lochemage