Commit 8310d34
committed
docs(CLAUDE.md): add post-squash-merge branch divergence to ops notes
Sixth operational finding, captured this session: when a PR is
squash-merged the squashed commit on main has a new SHA, distinct
from the source-branch commits. If you reset your local branch to
main, `git status` reports N "ahead of origin/branch" — but those
N are just main-side commits the obsolete remote-tip never saw,
not unpushed work.
Adds:
* Recognition checklist (PR closed/merged, local matches main,
remote tip is pre-merge SHA, `git log origin/<branch>..HEAD`
shows other people's work).
* Two safe fixes by intent:
git push origin --delete <branch> # done
git push --force-with-lease origin <branch> # align
* Note: --force-with-lease is safe here because there's no
unmerged remote work to clobber.
Pure documentation. Same branch / same PR shape as the previous
ops-notes commit.
Refs PR #344 (the trigger case)1 parent cd8db1c commit 8310d34
1 file changed
Lines changed: 30 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
211 | 211 | | |
212 | 212 | | |
213 | 213 | | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
214 | 244 | | |
215 | 245 | | |
216 | 246 | | |
| |||
0 commit comments