{"header":{"message":"docs(pijul): add channel merge and unmerge workflow guide","description":null,"timestamp":"2026-03-12T21:25:46.183319064Z","authors":[{}]},"hash":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC","authors":[{"login":"Chasesomero","key":"5PC59aEHVnet9mzMDabLcHL6PW7qVHLcyyHoocSk6L5L"}],"deps":{"hashes":[["XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC","docs(pijul): add channel merge and unmerge workflow guide"],["AA",null],["WHWKBNW24LBD5IU7B2CG53XZ6MXLOXTHKINIUZZHNVJUFVHGBKPQC",""],["32ICZXL46QYHSFGB4PQGZMUVMQNR5N4UFZ45WPMVGL5PNBFNXK2QC","init laravel zero for fun"],["44YOENACLYYR6MOL3ILKW7S6U6ZIUAAV2HVEAC6CVJKBSWOX5CAAC","docs(organize): save cleanup idea for later and organize personal first-time stuff to different file"]],"deps":["WHWKBNW24LBD5IU7B2CG53XZ6MXLOXTHKINIUZZHNVJUFVHGBKPQC","32ICZXL46QYHSFGB4PQGZMUVMQNR5N4UFZ45WPMVGL5PNBFNXK2QC","44YOENACLYYR6MOL3ILKW7S6U6ZIUAAV2HVEAC6CVJKBSWOX5CAAC"],"known":[]},"hunks":[{"Edit":{"inode":{"change":3,"pos":311777},"path":"README.md","line":95,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":725}],"down_context":[{"change":3,"pos":314483}],"flag":"BLOCK","start":0,"end":314,"inode":{"change":3,"pos":311777}}},"contents":[{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:0"}},{"Add":{"text":"## Feature merge/unmerge workflow with a baseline channel","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:58"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:59"}},{"Add":{"text":"See [Pijul feature channel merge and unmerge workflows](./PIJUL_FEATURE_CHANNEL_WORKFLOWS.md) for a simple recipe that uses a cleaner baseline such as `mainer-main`, feature channels such as `feature-login`, and an integration channel such as `staging`.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:313"}}]}},{"FileAdd":{"meta":{"basename":"PIJUL_FEATURE_CHANNEL_WORKFLOWS.md","metadata":0},"context":[{"change":2,"pos":1}],"contents":[{"Add":{"text":"# Pijul feature channel merge and unmerge workflows","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:426"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:427"}},{"Add":{"text":"This guide is written for both humans and automation/agents.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:488"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:489"}},{"Add":{"text":"It describes a simple way to:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:519"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:520"}},{"Add":{"text":"- keep a cleaner, more authoritative baseline channel such as `mainer-main`,","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:597"}},{"Add":{"text":"- pull a feature channel into an integration channel such as `staging`, and","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:673"}},{"Add":{"text":"- later remove that feature from `staging` without throwing away unrelated work.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:754"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:755"}},{"Add":{"text":"## The three-channel model","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:782"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:783"}},{"Add":{"text":"Use three kinds of channels:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:812"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:813"}},{"Add":{"text":"- `mainer-main`: your cleaner baseline or \"keep set\". It can be ahead of `staging`, but it must not include the feature you may want to remove later.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:963"}},{"Add":{"text":"- `feature-login`: a channel that represents one feature. Keep it around if you may want to add or remove that feature later.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1089"}},{"Add":{"text":"- `staging`: a mix-and-match channel where you pull features in and out.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1162"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1163"}},{"Add":{"text":"The key idea is:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1180"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1181"}},{"Add":{"text":"> To remove a feature later, compute `feature - mainer-main`, then unrecord those hashes from `staging`.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1286"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1287"}},{"Add":{"text":"## Important command choice: `fork` vs `channel new`","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1340"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1341"}},{"Add":{"text":"Use `pijul fork` when you want a new channel that starts from an existing channel:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1424"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1425"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1433"}},{"Add":{"text":"pijul fork --channel main mainer-main","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1471"}},{"Add":{"text":"pijul fork --channel mainer-main staging","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1512"}},{"Add":{"text":"pijul fork --channel mainer-main feature-login","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1559"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1563"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1564"}},{"Add":{"text":"Use `pijul channel new` only when you want an empty channel.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1625"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1626"}},{"Add":{"text":"## One-time setup","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1644"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1645"}},{"Add":{"text":"If you do not already have the channels you want:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1695"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1696"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1704"}},{"Add":{"text":"# Make a baseline copy of your main line.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1746"}},{"Add":{"text":"pijul fork --channel main mainer-main","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1784"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1785"}},{"Add":{"text":"# Make an integration channel from that baseline.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1835"}},{"Add":{"text":"pijul fork --channel mainer-main staging","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1876"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1877"}},{"Add":{"text":"# Make a feature channel from the same baseline.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1926"}},{"Add":{"text":"pijul fork --channel mainer-main feature-login","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1973"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1977"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:1978"}},{"Add":{"text":"If those channels already exist, do not recreate them.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2033"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2034"}},{"Add":{"text":"## Workflow 1: merge a feature into `staging`","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2080"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2081"}},{"Add":{"text":"### 1. Record the feature on its own channel","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2126"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2127"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2135"}},{"Add":{"text":"pijul channel switch feature-login","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2170"}},{"Add":{"text":"# edit files","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2183"}},{"Add":{"text":"pijul record -a -m \"feat(login): add login flow\"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2232"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2236"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2237"}},{"Add":{"text":"### 2. Pull that feature into `staging`","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2277"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2278"}},{"Add":{"text":"You can switch to `staging` first:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2313"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2314"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2322"}},{"Add":{"text":"pijul channel switch staging","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2351"}},{"Add":{"text":"pijul pull . --from-channel feature-login -a --no-prompt","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2408"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2412"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2413"}},{"Add":{"text":"Or target `staging` directly without switching:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2461"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2462"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2470"}},{"Add":{"text":"pijul pull . --from-channel feature-login --to-channel staging -a --no-prompt","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2548"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2552"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2553"}},{"Add":{"text":"### 3. Review what `staging` now has compared to the baseline","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2615"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2616"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2624"}},{"Add":{"text":"pijul channel switch staging","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2653"}},{"Add":{"text":"pijul diff --channel mainer-main --short","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2694"}},{"Add":{"text":"pijul log --channel staging --hash-only","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2734"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2738"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2739"}},{"Add":{"text":"Useful spot checks:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2759"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2760"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2768"}},{"Add":{"text":"pijul log --channel feature-login --hash-only","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2814"}},{"Add":{"text":"pijul change ","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2834"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2838"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2839"}},{"Add":{"text":"## Workflow 2: remove a feature from `staging`","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2886"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2887"}},{"Add":{"text":"This is the reverse workflow.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2917"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:2918"}},{"Add":{"text":"Do **not** pipe every hash from `feature-login` straight to `pijul unrecord`. A feature channel usually contains shared base history too, and you do not want to remove that from `staging`.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3107"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3108"}},{"Add":{"text":"Instead:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3117"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3118"}},{"Add":{"text":"1. compare the feature channel to a baseline that does **not** contain the feature, and","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3206"}},{"Add":{"text":"2. unrecord only the hashes that are unique to the feature channel.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3274"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3275"}},{"Add":{"text":"### 1. Preview the hashes that belong only to the feature","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3333"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3334"}},{"Add":{"text":"This prints hashes that are in `feature-login` but not in `mainer-main`:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3407"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3408"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3416"}},{"Add":{"text":"comm -13 \\","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3427"}},{"Add":{"text":" <(pijul log --channel mainer-main --hash-only | sort) \\","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3485"}},{"Add":{"text":" <(pijul log --channel feature-login --hash-only | sort)","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3543"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3547"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3548"}},{"Add":{"text":"If this list is empty, either:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3579"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3580"}},{"Add":{"text":"- the feature channel has no unique recorded changes, or","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3637"}},{"Add":{"text":"- your baseline already contains the feature, which means it is not the right baseline for unmerging.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3739"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3740"}},{"Add":{"text":"### 2. Inspect the candidate hashes before removing them","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3797"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3798"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3806"}},{"Add":{"text":"comm -13 \\","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3817"}},{"Add":{"text":" <(pijul log --channel mainer-main --hash-only | sort) \\","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3875"}},{"Add":{"text":" <(pijul log --channel feature-login --hash-only | sort) \\","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3935"}},{"Add":{"text":"| xargs -r -n 1 pijul change","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3964"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3968"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:3969"}},{"Add":{"text":"### 3. Unrecord those feature-only hashes from `staging`","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4026"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4027"}},{"Add":{"text":"This Bash snippet gathers the hashes first, then passes them to a single `unrecord` command:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4120"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4121"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4129"}},{"Add":{"text":"mapfile -t feature_only_hashes < <(","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4165"}},{"Add":{"text":" comm -13 \\","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4178"}},{"Add":{"text":" <(pijul log --channel mainer-main --hash-only | sort) \\","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4238"}},{"Add":{"text":" <(pijul log --channel feature-login --hash-only | sort)","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4298"}},{"Add":{"text":")","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4300"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4301"}},{"Add":{"text":"if ((${#feature_only_hashes[@]})); then","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4341"}},{"Add":{"text":" pijul unrecord --channel staging --reset --no-prompt \"${feature_only_hashes[@]}\"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4424"}},{"Add":{"text":"else","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4429"}},{"Add":{"text":" echo \"No feature-only hashes found.\"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4468"}},{"Add":{"text":"fi","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4471"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4475"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4476"}},{"Add":{"text":"`--reset` updates the working copy so `staging` actually reflects the removed feature.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4563"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4564"}},{"Add":{"text":"### 4. Review `staging` after the unmerge","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4606"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4607"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4615"}},{"Add":{"text":"pijul channel switch staging","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4644"}},{"Add":{"text":"pijul diff --channel mainer-main --short","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4685"}},{"Add":{"text":"pijul log --channel staging --hash-only","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4725"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4729"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4730"}},{"Add":{"text":"## Useful command strings","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4756"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4757"}},{"Add":{"text":"### Merge a feature into `staging` in one command","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4807"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4808"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4816"}},{"Add":{"text":"pijul pull . --from-channel feature-login --to-channel staging -a --no-prompt","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4894"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4898"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4899"}},{"Add":{"text":"### Print the feature-only hashes","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4933"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4934"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4942"}},{"Add":{"text":"comm -13 \\","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:4953"}},{"Add":{"text":" <(pijul log --channel mainer-main --hash-only | sort) \\","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5011"}},{"Add":{"text":" <(pijul log --channel feature-login --hash-only | sort)","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5069"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5073"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5074"}},{"Add":{"text":"### Inspect why a change cannot be removed cleanly","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5125"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5126"}},{"Add":{"text":"If `pijul unrecord` refuses because later work depends on a feature hash, inspect dependents:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5220"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5221"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5229"}},{"Add":{"text":"pijul dependents ","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5253"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5257"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5258"}},{"Add":{"text":"That will show changes that depend on the hash you are trying to remove.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5331"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5332"}},{"Add":{"text":"## Rules of thumb","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5350"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5351"}},{"Add":{"text":"- Keep feature channels around while you may still want to pull or unpull them elsewhere.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5441"}},{"Add":{"text":"- `mainer-main` does not need to be an exact pre-merge snapshot. It can be \"mainer\" than `staging` as long as it does not contain the feature you want to subtract.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5605"}},{"Add":{"text":"- The baseline is a \"keep set\": whatever is already in `mainer-main` is treated as something you want to preserve.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5720"}},{"Add":{"text":"- If `staging` has later changes that depend on the feature, `pijul unrecord` may refuse until you also remove those dependent changes.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5856"}},{"Add":{"text":"- `pijul apply` reads change text from standard input, not hash lists. For hash-driven workflows, pass hashes as command arguments instead.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5996"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:5997"}},{"Add":{"text":"## Short version","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6014"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6015"}},{"Add":{"text":"Merge in:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6025"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6026"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6034"}},{"Add":{"text":"pijul pull . --from-channel feature-login --to-channel staging -a --no-prompt","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6112"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6116"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6117"}},{"Add":{"text":"Unmerge out:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6130"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6131"}},{"Add":{"text":"```bash","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6139"}},{"Add":{"text":"mapfile -t feature_only_hashes < <(","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6175"}},{"Add":{"text":" comm -13 \\","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6188"}},{"Add":{"text":" <(pijul log --channel mainer-main --hash-only | sort) \\","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6248"}},{"Add":{"text":" <(pijul log --channel feature-login --hash-only | sort)","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6308"}},{"Add":{"text":")","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6310"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6311"}},{"Add":{"text":"if ((${#feature_only_hashes[@]})); then","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6351"}},{"Add":{"text":" pijul unrecord --channel staging --reset --no-prompt \"${feature_only_hashes[@]}\"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6434"}},{"Add":{"text":"fi","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6437"}},{"Add":{"text":"```","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6441"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6442"}},{"Add":{"text":"That is the core pattern:","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6468"}},{"Add":{"text":"","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6469"}},{"Add":{"text":"- **merge** with `pijul pull`, and","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6504"}},{"Add":{"text":"- **unmerge** with `source-minus-baseline`, then `pijul unrecord --reset`.","pos":"XSOOHSO4A7VPJWWUYULAPCDQNVDOYPRQLKUW24NQIYHQSBJAR76QC:6579"}}]}}],"owner":"Chasesomero","repo":"test","token":"fC2r9OdNzZ9pd3INnlxC/1P4rx8mXA+bMkY6IsxhhTA=","login":null}

…

Dependencies

Change contents

Review