Skip to content

Feat/three way merge #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aman-a-shah merged 5 commits into from
Oct 13, 2026
Merged

Feat/three way merge #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47a0aae
Add three-way merge and conflict resolution.
DanisLol Oct 13, 2026
59035e2
Fix merge CLI test to switch branches before checkout.
DanisLol Oct 13, 2026
f7f7df8
Integrate Myers diff and packed storage with three-way merging
aman-a-shah Oct 13, 2026
b3e5dd5
Use Myers edits and preserve explicit conflict resolutions across CLI…
aman-a-shah Oct 13, 2026
c7d2006
Integrate validated push conflict detection with three-way merging
aman-a-shah Oct 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,18 @@ minigit status # clean
Checkout restores files, executable modes, and the index. It rejects staged or
unstaged changes and untracked paths that would be overwritten. Fast-forward
merges keep HEAD on the current branch and create no additional commit.
Diverged branches report that three-way merging is not implemented yet.
Diverged branches use Myers line edits for a three-way merge. Disjoint text edits
produce a commit with both parents. Conflicts write markers and leave branch refs
unchanged. Edit each conflicted file, run `minigit add <path>`, then
`minigit commit -m "Resolve merge"`. To resolve by deleting a file, remove it and
add its path. Pending conflicts survive new CLI processes and block another
merge, checkout, or commit until explicitly resolved.

`minigit diff` shows line changes between HEAD and working files, including
untracked files, binary changes, executable modes, and missing final newlines.
`minigit status` retains its staged / not staged / untracked sections. Both
commands are read-only. Object storage also supports local
[packfiles](docs/packfiles.md) without changing object hashes.

To test push, initialize another scratch repository and run
`minigit serve --port 9418 --token demo-token` there. From the first repository,
Expand Down
Loading
Loading