Commit 350a07b
committed
merge: back-merge main (v2.7.43) into dev
dev and main had diverged on the version line alone: dev sat at 2.7.41 while
main shipped 2.7.43 through two release commits that never came back. main was
not an ancestor of dev, so the next promotion would have been a merge rather
than a fast-forward, and the ledger would have kept drifting with every release.
merge-tree confirmed the merge is clean and that the whole material change is
one line of package.json. Promotion from here is a real fast-forward.1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
0 commit comments