BK-CONFLICTS(1)

okay so bestie, this is bk conflicts(none) from the BitKeeper User’s Manual — and it’s giving “find the unresolved conflict files” main character energy 💅✨

💅 NAME 💅

bk conflicts — list unresolved files which contain conflicts. Not me being dramatic, it literally lists the unmerged files with content conflicts that still need to be resolved 😭

✨ SYNOPSIS ✨

bk conflicts [−dDfrvS] [file ...]

🦋 DESCRIPTION 🦋

The conflicts command lists unmerged files which contain content conflicts and need to be resolved. Both filenames and directory names may be specified, and they are treated as in bk gfiles. Only files that contain conflicts are actually listed — no fake listings, periodt 💖

Any options specified will operate only on the set of files that would normally be listed. Lowkey important, highkey useful 🫶

🎀 OPTIONS 🎀

• −d — Invoke bk diff on the file, showing the differences between the local and remote files. It’s giving “show me the receipts” 🔥
• −D — Like −d but using the graphical diff tool instead of text diffs. Fancy visual vibe check 🦋
• −f — Invoke the 3‐way filemerge in read-only mode. This is useful in case the developer working on a particular merge wants a second person to see the conflict in question without the danger of overwriting the merged file. Safe peek, no accidental chaos 🙈
• −r — Invoke revtool, highlighting the GCA, LOCAL, and REMOTE versions in the file. Iconic revision-tool moment 👑
• −S — When used in a nested collection, treat the repository as if it were detached rather than as part of the collection. Detached-repo behavior, slay 💅
• −v — Verbose listing. The output lists the files that match the filenames or directories specified, along with the number of non‐automerged conflicts in the file. Now we’re counting conflict blocks, bestie 🎀
• −vv — More verbose listing. As above but shows the number of lines in conflict with the authors of those lines. Maximum tea, maximum detail 🍓

🌈 EXAMPLES 🌈

$ bk conflicts ’*.h’
src/bkd.h
src/logging.h
src/mdbm/common.h
src/mdbm/mdbm.h
src/sccs.h
src/win32.h

$ bk conflicts −v ’*.h’
src/bkd.h has 2 conflict blocks
src/logging.h has 2 conflict blocks
src/mdbm/common.h has 1 conflict block
src/mdbm/mdbm.h has 3 conflict blocks
src/sccs.h has 3 conflict blocks
src/win32.h has 1 conflict block

$ bk conflicts −vv ’src/logging.h’
src/logging.h has 2 conflict blocks
  63 local lines by wscott
   7 local lines by lm
  33 remote lines by wscott
   5 remote lines by lm

🔥 SEE ALSO 🔥

• bk‐diff
• bk‐difftool
• bk‐fm3tool
• bk‐resolve
• bk‐resolving
• bk‐revtool
• bk‐gfiles

👑 CATEGORY 👑

Repository

Signed off by BitKeeper Inc, version 1E1, on the bk conflicts(none) page — that’s the footer glow-up, bestie. Date isn’t on this footer, so I’m not inventing one 🫶💖✨