Adding Merge Abort, Tool and launch mergetool on conflict - #389
Open
bordaigorl wants to merge 3 commits into
Open
Adding Merge Abort, Tool and launch mergetool on conflict#389bordaigorl wants to merge 3 commits into
bordaigorl wants to merge 3 commits into
Conversation
Introduces `mergetool_on_conflicts` settings (default to false)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Introduces
mergetool_on_conflictssettings (default to false) so that the Merge Branch command will launch mergetool when a merge generates conflicts.The Merge Abort and Merge Tool commands are added, and are enabled only in the middle of a merge.