Conversation
geofflamrock
force-pushed
the
improve-conflict-detection
branch
3 times, most recently
from
4db1c0c to
b589858
Compare
geofflamrock
force-pushed
the
improve-conflict-detection
branch
from
f386950 to
043af29
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR improves conflict detection by replacing the interactive prompt-based conflict resolution system with an automated polling-based approach. The change allows the CLI to wait for users to manually resolve conflicts outside the application and automatically detect when the operation has been completed or aborted.
Key changes:
- Replaces interactive conflict prompts with automated conflict state polling
- Introduces new Git state detection methods for merge and rebase operations
- Simplifies the conflict resolution workflow by removing user interaction requirements
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
src/Stack/Git/GitClient.cs |
Adds new methods to detect merge/rebase progress and retrieve HEAD/ORIG_HEAD SHA values |
src/Stack/Git/ConflictResolutionDetector.cs |
New utility class that polls Git state to detect conflict resolution completion or abortion |
src/Stack/Commands/Helpers/StackActions.cs |
Replaces interactive conflict prompts with automated conflict resolution detection |
src/Stack/Commands/Helpers/Questions.cs |
Removes unused conflict resolution prompt constants |
src/Stack.Tests/Git/GitClientTests.cs |
Adds tests for new Git state detection methods |
src/Stack.Tests/Git/ConflictResolutionDetectorTests.cs |
Comprehensive tests for the new conflict resolution detection logic |
src/Stack.Tests/Commands/Helpers/StackActionsTests.cs |
Updates tests to work with new automated conflict resolution approach |
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.
Improves conflict handling by replacing the user prompt with a poll that detects when conflicts have been handled externally. When conflicts resolution is complete we move on to the next action (e.g. merge the next branch in the chain).
This means that the user can go and fix conflicts in whatever means they normally do, and doesn't have to remember to come and say Continue at the prompt (which would then fail because the action has probably already been completed anyway).
Fixes #233