CVSQ-MERGE(1)

💅 CVSQ-MERGE 💅

okay so this is cvsq-merge(1) — section 1 of the manual, bestie, write it down 📝 — and it's the little helper that sets up your merge files when a change got yeeted onto a branch through cvsq-branch.

---

✨ NAME ✨

cvsq-merge — set up the files you need to merge in a change that went to a branch via cvsq-branch. that's the whole job, and it eats every time 🫶

---

🎀 SYNOPSIS 🎀

cvsq-merge [-l] .<tag>

---

🌸 DESCRIPTION 🌸

okay so picture this: you just did an update, and you find a file named .cvsq-branch-... sitting there. that file is literally the vibe check telling you a commit got redirected to a branch via cvsq-branch(1) 👑

usually that's exactly when cvsq-merge gets called — with that file name as its argument. and what it does is lowkey iconic: it sets up two symbolic links, .origin and .branch, pointing at a copy of the working directory, updated to the beginning and the end of the identified branch. two copies, two eras, one merge. periodt 💅

so how do the two ends get made?

• the beginning of the branch — it copies the current directory and calls cvs update -r<tag>-start inside that copy 🌱
• the end of the branch — it copies the current directory and calls cvs update -r<tag> inside that copy 🌳

same recipe, different tag suffix. not me thinking that's actually so clean 😭

---

🔥 OPTIONS 🔥

• -l — use lcvs(1) instead of cvs(1) to update the copies of the working directory. one tiny flag, whole different tool, iykyk ✨

---

🦋 FILES 🦋

• ~/.cvsq-branch/merge/<tag> — this directory is where the magic lives. it contains the subdirectories origin and branch, and those hold a copy of the working directory updated to the beginning and the end of the branch respectively. two little folders, both main character energy 💖

---

🌈 SEE ALSO 🌈

cvsq-branch(1), lcvs(1), cvsq(1), cvs(1)

go read the whole friend group, fr fr 🫶

---

👑 AUTHOR 👑

Klaus Aehlig <aehlig@linta.de> — the icon who made all this happen 🎀

---

ngl bestie, this one is short and sweet: find the .cvsq-branch-... file, hand it over, get your .origin and .branch symlinks, merge, slay. no cap 💀✨

---

that's the whole page, bestie — cvsq-merge(1), dated April 24, 2007, and yeah the header and footer both just say CVSQ-MERGE(1) because that's how manpages roll 💜 see you in the next one, mwah 🍓