Repository navigation
Add Conflict Preview to community conflict tools - #1030
Open
LaptekTools wants to merge 1 commit into
Open
LaptekTools wants to merge 1 commit into
LaptekTools wants to merge 1 commit into
Conversation
This branch has not been deployed
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.
Adds Conflict Preview to the community conflict-tools list. It groups selected conflict-copy filenames and compares file contents in a read-only browser preview; it does not choose, merge or delete versions. Unreadable files and missing originals remain visible.
The entry links the public MIT source and working browser tool. Local checks cover16 fictional input/error scenario families, and the hosted example works; real-user adoption is unverified. No existing entries are changed.