BK-REMERGE(1)

💖 NAME 💖

Manual name: bk remerge(none) — from the BitKeeper User’s Manual. The name/description combo is literally bk remerge − redo the last merge, and that’s the whole main character energy of this page. Bestie, it’s here to help you redo the last merge. 💅

✨ SYNOPSIS ✨

bk remerge [−T] file [file ...]

💅 DESCRIPTION 💅

Okay so bk remerge looks at the specified file[s] and tries to remerge the last merge. No cap, that’s the vibe.

Each file may not be edited with modifications and must have a merge as the most recent delta; files not meeting these requirements are skipped. So if your file doesn’t match, it gets skipped — don’t take it personally. 🫶

The merged file is left as the current working file after the merge is completed. The merge may be graphical (default) or text based. In the latter case, the marked up file is left as the working file and you must manually edit it to complete the merge. That’s the text-based path: marked up file stays put, and you’re on manual-edit duty, bestie. 😭

🎀 OPTIONS 🎀

• −T — use a text based merge tool. That’s the icon, the moment, the whole flag. ✨

🦋 SEE ALSO 🦋

Go say hi to bk‐fm3tool and bk‐smerge — iykyk, they’re in the same little Unix friend group. 🦋

🌈 CATEGORY 🌈

File — that’s the category, periodt. 👑

Cute sign-off: source is BitKeeper Inc, version/date marker 1E1, and the footer’s right-hand title is bk remerge(none) — bye bestie, go remerge that last merge 💖💅