Conflicts

How conflicts work

Conflicts happen when two changes edit the same code. VisualJJ marks conflicted changes in the tree and shows which files are affected.

Unlike Git, conflicts don't block you from working. You can switch to other changes and come back to resolve conflicts later.

Resolving conflicts

Click a conflicted file and select Resolve conflicts. VS Code shows a three-way merge view where you can pick the right resolution for each section.

Or edit the file directly — find the conflict markers (<<<<<<<, =======, >>>>>>>), edit to the final result, and save.

After resolving

Once all conflicts in a change are resolved, the conflict marker disappears and the change is ready to ship.

Avoiding large conflicts

• Keep your work on top of the latest main. Drag your stack onto main, or right-click and select Rebase on Main. Do this often — small moves beat one big painful catch-up.
• Keep changes small and focused. A change that touches three files conflicts less than one that touches thirty.
• Resolve conflicts as they appear rather than letting them stack up across multiple changes.