Diagnose merge conflicts in SPRING controls PR #187
Conversation
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
Merged
Copilot
AI
changed the title
[WIP] Merge controls for SPRING
Diagnose merge conflicts in SPRING controls PR
Dec 1, 2025
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.
PR #186 has merge conflicts that cannot be resolved via GitHub's web interface. This PR documents the conflict analysis.
Conflicts Identified
Content conflicts (both branches modified same lines):
development/rotator/rotator_prediction.pywsp/camera/camera.pywsp/config/config.yamlwsp/control/systemControl.pywsp/plotLastImg.pywsp/utils/paths.pyModify/delete conflicts (deleted in main, modified in branch):
wsp/camera/config.pywsp/camera/daemon_framework.pywsp/camera/daemons/fake_camera_daemon_interface_test.ipynbwsp/camera/daemons/spring_camera_daemon.pywsp/config/telemetry_config.yamlWhy Web Resolution Fails
The modify/delete conflicts require deciding whether to restore deleted files or discard branch modifications—decisions GitHub's web editor cannot prompt for. Content conflicts have overlapping hunks requiring manual inspection.
Resolution
Rebase
scheduler_issue_20251126ontomainlocally and resolve conflicts manually.💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.