diff --git a/README.md b/README.md index 81d6bd69..9358df6f 100644 --- a/README.md +++ b/README.md @@ -393,6 +393,20 @@ git log --oneline ..template/main # what changed since you copied git cherry-pick -x # one fix; -x records its origin ``` +Take an unreleased range as a whole. A repository that shares the template's +history merges the range's branch. One that does not (it started from a copy +of the files) merges three-way against the range base, which leaves the files +both sides changed as conflicts; resolve them and commit: + +```bash +git merge --no-ff template/ # shared history +git merge-recursive -- HEAD template/ # no shared history +``` + +Keep the base you synced from where your project records it: `.template-origin` +(below), or your own lock file (tech-log keeps it as `sourceRevision` in +`template.lock.json`). Move it to the range end once the range is in. + When the files have moved or diverged too far for a clean pick, read the change as a diff and apply it by hand: