fix: auto-resolve sync conflicts and preserve existing .gitignore#13
Merged
fix: auto-resolve sync conflicts and preserve existing .gitignore#13
Conversation
metamorph sync (and periodic daemon syncs) would fail with merge conflicts when the upstream repo and project dir had divergent versions of scaffolded files like PROGRESS.md and .gitignore. This was caused by InitUpstream creating scaffold files independently from metamorph init, producing parallel histories that could never cleanly merge. Two fixes: - SyncToProjectDir now uses `git merge -X theirs` so conflicts auto-resolve in favor of upstream (agent work), which is the content being synced in. - metamorph init now appends to .gitignore instead of overwriting it, preserving any existing language-specific entries. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Code reviewNo issues found. Checked for bugs and CLAUDE.md compliance. |
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
SyncToProjectDirnow usesgit merge -X theirsto auto-resolve merge conflicts in favor of upstream (agent) changes, fixingmetamorph syncfailures when scaffold files (PROGRESS.md, .gitignore) diverge between the project dir and upstreammetamorph initnow appends to.gitignoreinstead of overwriting it, preserving any existing language-specific entries (e.g./target,Cargo.lock)Test plan
go test ./cmd/ ./internal/gitops/)metamorph initin a project with an existing.gitignoreand verify entries are appended, not overwrittenmetamorph sync, verify it succeeds with upstream version🤖 Generated with Claude Code