fix: auto-stash during /orch-integrate + clearer completion message - #89
Merged
Merged
Conversation
Simplified to two options (apply now vs PR for review). Removed --merge from default message (shown in error fallback if ff fails). Added 'Your branch was not modified' to reassure users.
…ompletion message Three changes: 1. /orch-integrate stashes dirty working tree before ff/merge and pops after. Workspace mode leaves STATUS.md modifications in the working tree for dashboard visibility — these blocked ff with 'local changes would be overwritten'. 2. Batch completion message simplified to two options (apply now vs PR). Removed --merge from default display (shown in ff error fallback). Added 'Your branch was not modified' reassurance. 3. Updated tests for new stash-check git call ordering.
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.
STATUS.md in working tree blocked ff merge. Now stashes before and pops after. Also simplified completion message. 828 tests.