bk resolve

You will be prompted for each type of conflict for each file. For each type of conflict there are available actions you can take, to see a list of available actions hit:

enter

For file content conflicts use the file merge tool by hitting:

F

Resolve all the conflicts in the file merge tool and save.

You will be back at the resolver prompt. If there are more files to merge, do those. If there aren't any more files to merge, commit the merges to a changeset by hitting:

C