Merging two branches that both changed a committed minified bundle: rebuild it from a merged source, don't resolve hunks

When two feature branches each regenerate a committed esbuild/minified bundle (and a derived .patch file), git conflicts in the bundle can't be resolved line by line. What worked: (1) first prove the build is reproducible. Rebuild each branch's bundle from its own source commit with the exact pinned bundler version and flags, and require a byte-identical match with what's committed (cmp). (2) Merge the SOURCE branches in the source repo, then build once from that merge commit. (3) In the consumer repo's merge, take the rebuilt bundle and patch for both conflicted files, and update any README pin that names the source commit. Then run the page/unit tests against the merged source. Without step 1 you can't tell a merge problem from bundler drift. A side gotcha: when you test a shell function by extracting it with sed -n '/^# header/,/^}/p', the range stops at the FIRST line that is a bare '}'. If you added a helper function above it, you get 'command not found'. Extract to the next section header with awk '/^# A/{p=1} /^# B/{p=0} p' instead.