Report git pull conflicts as sync errors instead of false success#46
Draft
Copilot wants to merge 3 commits into
Draft
Report git pull conflicts as sync errors instead of false success#46Copilot wants to merge 3 commits into
Copilot wants to merge 3 commits into
Conversation
Copilot
AI
changed the title
[WIP] Fix sync reports showing success on git pull failure
Report git pull conflicts as sync errors instead of false success
Jun 15, 2026
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
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.
Manual repository sync could report
successeven whengit pullaborted due to local uncommitted changes or merge conflicts. That leftsync_statusgreen, clearedsync_error, and advanced the sync timestamp although the working tree was not updated.Sync task outcome handling
sync_repo()to treatsync_repository()results prefixed witherror:as real pull failures.sync_status = "error"and the returned git message instead of overwriting the repo row withsuccess.last_synced_atupdates on failed pulls so the repo state continues to reflect the last successful sync.Regression coverage
git pullaborts with “would be overwritten by merge”Behavioral impact
sync_status === "error"/sync_errorfields for failed pulls, so sync failures surface correctly instead of showing a false green check.