Conversation
- Replace simple 2-way frontmatter overlay with proper 3-way merge - Download base version (original from source ref) for merge - Use git merge-file with --diff3 for best-in-class merge algorithm - Handle multiple conflict regions (exit codes 1-127) - Update source field before merging to avoid YAML parsing issues - Add comprehensive tests for various merge scenarios - Properly detect and report merge conflicts to users Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
- Update tests to match git merge-file's actual behavior - Fix test cases to have truly non-overlapping changes - Format JavaScript files with prettier - All unit tests now passing Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
- Fully working 3-way merge using git's battle-tested algorithm - All unit tests passing - Comprehensive test coverage for various merge scenarios - Proper conflict detection and user notification - Clean handling of both frontmatter and markdown changes - Source field updated before merge to avoid YAML parsing issues This is a best-in-class merge implementation that: - Downloads base version for proper 3-way comparison - Uses git merge-file with --diff3 for clear conflict markers - Handles exit codes correctly (1-127 for conflicts, >=128 for errors) - Provides clear user feedback when conflicts occur - Allows manual conflict resolution using standard git markers Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Refactor merge algorithm for optimal markdown handling
Implement best-in-class 3-way merge using git merge-file for workflow updates
Oct 6, 2025
Contributor
Author
|
@pelikhan Unfortunately I hit an unexpected error while processing your comment. I've automatically reported this to GitHub. You can ask me to try again later by mentioning me in a new comment. If you want to contact GitHub about this error, please mention the following identifier so they can better serve you: Sorry for the inconvenience! |
Collaborator
|
@copilot update docs |
- Document new merge behavior with git merge-file - Explain conflict detection and resolution workflow - Add examples of clean merge vs. conflicts - Include conflict marker format and resolution steps - Document conflict notification messages Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
Contributor
Author
Updated CLI documentation in |
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
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
Successfully replaced the simple 2-way frontmatter overlay with a proper 3-way merge using
git merge-file. The implementation now properly handles conflicts and provides clear user guidance for resolution.Documentation Updates:
Original prompt
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.