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

• Rebase onto main frequently
• Keep changes small and focused
• Resolve conflicts before they stack up