Resolve a conflict during Rejoin
Resolve overlapping changes when Rejoin pauses on a conflict.
Last updated 17 September 2026
Resolve overlapping changes when Rejoin pauses on a conflict.
Before you begin
Read the Rejoin outcome before taking another action. Preserve both versions of the work and avoid forcing a merge merely to clear the message.
This screenshot shows the Rejoin confirmation and target selection, not a conflict result. The steps below explain the conflict flow when Choro reports overlapping changes.
Steps
When Rejoin pauses, read the conflict card’s target branch and list of overlapping files. The card explains that the target was not touched.
Inspect the intended behavior on both sides. Give the agent any product decision needed to combine the changes correctly.
Choose Have the agent sort it to hand the conflict context to the Solo agent, or Not now when you need to investigate first.
Review the resolution in the Solo folder. Check the combined behavior and run the relevant tests; removing conflict markers alone is insufficient.
When the work is ready to rejoin, choose Rejoin again and confirm the intended target in the dialog.
Read the final outcome and inspect the target branch after completion. If the target changes again, a new conflict may need another review.
What to expect
The conflict is resolved deliberately in the Solo before the merge is retried.
Troubleshooting
The screenshot shows the Rejoin target-confirmation step, not a simulated conflict result. Distinguish a conflict pause from an authentication, dirty-target, or cleanup error and follow the actual message. Do not discard one side’s changes unless that is the intended resolution.