Skip to main content
Generated from bd help --doc conflicts. Inspect and resolve the merge conflicts sitting in the working set. Conflicts appear when a pull or merge brought in changes that collide with local ones and could not be settled automatically. These commands present them per issue and per field, and resolve them without the raw dolt CLI. Examples: bd conflicts list # which tables and issues are conflicted bd conflicts show # every conflicted row, field by field bd conflicts show bd-1234 # one issue bd conflicts resolve bd-1234 —ours # keep our side of one issue bd conflicts resolve —all —theirs # take their side of everything

​
bd conflicts list

List tables and issues with live merge conflicts

​
bd conflicts resolve

Resolve live merge conflicts, then conclude the merge with a commit. Named issue IDs are resolved row by row, leaving every other conflicted row alone. —all resolves whole tables at once (dolt’s own table-level resolution). The merge is committed only once NO conflicts remain, so a partial resolution leaves the merge open for the next pass. Row-by-row resolution requires the row to exist on both sides: when one side deleted it, resolve that table wholesale or edit the row directly. Examples: bd conflicts resolve bd-1234 —ours # keep our side of one issue bd conflicts resolve bd-1234 bd-5678 —theirs # take their side of two bd conflicts resolve —all —ours # every conflicted table bd conflicts resolve —all —table config —theirs bd conflicts resolve —conclude # commit an already-resolved merge
Flags:

​
bd conflicts show

Show each conflicted row with its fields side by side. Only fields where our side and their side disagree are shown; —all-fields shows every column. Without an issue ID, every conflicted row of every conflicted table is shown.
Flags: