fix: prevent merge conflicts by deferring upstream creation to start#11
Merged
fix: prevent merge conflicts by deferring upstream creation to start#11
Conversation
Move upstream bare repo creation from `init` to `start` so users can customize metamorph.toml and AGENT_PROMPT.md before the upstream snapshot is taken. `start` now requires a clean working tree and creates the upstream from the committed project state on first run. Also abort failed merges in SyncToProjectDir so the repo is never left in a broken merge state. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.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
inittostartso users can customizemetamorph.tomlandAGENT_PROMPT.mdbefore the upstream snapshot is taken. Previously,initcreated the upstream immediately with stale templates, causing merge conflicts on first sync.startnow requires a clean working tree and creates the upstream from the committed project state on first run. Subsequent starts skip upstream creation.SyncToProjectDirnow aborts failed merges (git merge --abort) so the repo is never left in a broken merge state — it will retry cleanly on next sync.Test plan
TestInitCreatesAllFiles— updated to no longer expect upstream dirTestStartRejectsDirtyTree— verifies dirty tree is rejected with helpful messageTestStartCreatesUpstream— verifies upstream is created on firststart --dry-runTestSyncToProjectDir/aborts merge on conflict— verifies merge is aborted andMERGE_HEADcleaned upmetamorph init→ edit config → commit →metamorph start --dry-run→ verify upstream created with customized config🤖 Generated with Claude Code