Add support for resolving conflicts#26
Open
adam-talos wants to merge 1 commit into
Open
Conversation
f5b897e to
5448b7b
Compare
- Add conflict resolution design spec - Add conflict resolution implementation plan - Add conflict domain types, ConflictExtractor interface, and resolveList CLI command - Add JjMarkerConflictExtractor with TDD - Handle C status in JujutsuChangeProvider for conflict detection - Add JujutsuMergeProvider and register with JujutsuVcs - Polish conflict resolution feature: injectable extractor, lint, dead code
5448b7b to
97bd7fe
Compare
Owner
|
Thank you very much for this pull request! Conflict resolution has been on the backlog for a while, and this is a great step change for this plugin. I'll take a look over the next few days and hopefully get it merged soon. |
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
2 participants
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.
Summary
Adds the ability to detect merge conflicts in a repo and to resolve them using a 3 panel diff (Yours/Both/Incoming) in the same way as the git is handled in Idea.
Cstatus inJujutsuChangeProviderJjMarkerConflictExtractorto parse JJ's embedded conflict markers intoMergeData(CURRENT/ORIGINAL/LAST) for three-way merge viewJujutsuMergeProviderusing the extractor and registers it withJujutsuVcs, so "Resolve Conflicts..." appears automatically in the Changes viewDetails
JJ uses embedded conflict markers in files rather than git-style
<<<<<<</>>>>>>>markers. This PR parses those markers and wires them into IntelliJ's standard 3-panel merge editor, providing the same "Resolve Conflicts..." UX that git users expect.The
ConflictExtractorinterface is injectable for testability, andJjMarkerConflictExtractoris covered by TDD unit tests.Test plan
Cstatus in the Changes view./gradlew test