[WIP] Fix issue with unresolved conflict markers in sync#469
Draft
[WIP] Fix issue with unresolved conflict markers in sync#469
Conversation
- Modified _merge_with_base to return bool indicating conflict status - Modified sync_merge to propagate conflict status return value - Modified sync command to raise RuntimeError when conflicts detected - Updated rhiza_sync workflow to fail instead of committing on conflicts - Added tests for CLI conflict exit behavior - Added tests for _merge_with_base conflict return value This change prevents automated workflows from committing files with conflict markers or .rej files when template sync encounters merge conflicts. The workflow will now fail with a clear error message directing users to resolve conflicts locally. Agent-Logs-Url: https://github.com/Jebel-Quant/rhiza-cli/sessions/e683d3bf-c566-478d-8e69-13976fa2261f Co-authored-by: HarryCampion <40582604+HarryCampion@users.noreply.github.com>
Collaborator
|
@claude[agent] review the failures here in the CI and report back with what the changes broke and why. |
The test was failing because it didn't mock the git operations that determine conflict status. After commit 1cb12f5 made sync() raise RuntimeError on conflicts, this test needed to mock _apply_diff to return True (clean merge). Added mocks for: - GitContext.get_diff: returns a sample diff - GitContext._apply_diff: returns True (no conflicts) This follows the same pattern as the new tests added in test_sync.py. Fixes test failure across all platforms and Python versions. Co-authored-by: HarryCampion <40582604+HarryCampion@users.noreply.github.com>
Author
|
Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details. Warning Firewall rules blocked me from connecting to one or more addresses (expand for details)I tried to connect to the following addresses, but was blocked by firewall rules:
If you need me to access, download, or install something from one of these locations, you can either:
|
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
3 participants
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.
Thanks for asking me to work on this. I will get started on it and keep this PR's description up to date as I form a plan and make progress.