feat: diff3-style three-way conflict output in .rej files#28
Merged
Conversation
When a merge conflict is detected in apply_merge(), the .rej file now includes all three versions (base, user, new template) along with both unified diffs, making it easier to resolve conflicts manually.
Deploying diecut with
|
| Latest commit: |
39e87f8
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://1bc17b43.diecut.pages.dev |
| Branch Preview URL: | https://feat-diff3-conflict-format.diecut.pages.dev |
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.
Summary
apply_merge()conflict output to include all three file versions (base, user, new template) in.rejfilesTest plan
cargo fmt --checkcleancargo clippy -- -D warningsclean