feat: add MiniGit branch merge support - #6
Open
YamunadeviShanmugam wants to merge 2 commits into
Open
Conversation
Implement MiniGit merge across operations, CLI, and Flask UI with safe fast-forward, already-up-to-date detection, diverged two-parent merge commits, and conflict abort behavior while preserving branch tips on failure. Co-authored-by: Cursor <cursoragent@cursor.com>
Create a repository-level architecture.md that describes current MiniGit layers, data model, runtime flow, and dependency boundaries so contributors can understand the system design quickly. Co-authored-by: Cursor <cursoragent@cursor.com>
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
Operationswith already-up-to-date, fast-forward, and diverged merge pathsparent_hash2and keep branch tips unchanged on merge errors/conflictsminigit merge <source-branch>and a Flask merge action, with tests for backend/CLI/UI flowsTest plan
.venv/bin/pytest tests/ -vmake check(blocked by pre-existing repo-wide lint baseline unrelated to this ticket)Made with Cursor