Resolving conflicts
When a rebase, squash, or merge leaves a conflict, jj records it in the commit rather than blocking you. The conflicted commit stays in your log with a conflict badge — you can keep working and resolve it whenever you like.
Open the resolver
Section titled “Open the resolver”Select the conflicted commit, then click the conflicted file in its changes list. wyrmflow opens its built-in three-way resolver — there’s no external merge tool to install or configure.
Resolve
Section titled “Resolve”The resolver shows the two conflicting sides — A and B — side by side, with the merged Output below:
- Take all from A or Take all from B to accept one side wholesale.
- Accept either side per conflict region for finer-grained control.
- Edit the Output directly for a fully manual resolution.
Conflicts live in jj, so closing the resolver never loses your progress — reopen it any time.
Click Save. wyrmflow writes the resolved file back into the commit, and the conflict badge clears from the log.