feat: resolve increments from merged branches - #5140

Open

fzlzjerry wants to merge 21 commits into

GitTools:mainfrom

fzlzjerry:feat/4433-prevent-merged-branch-increment

Commits on Aug 21, 2026

feat: resolve increments from merged branches
fzlzjerry
committed
0e38ad7
test: collapse equivalent alignment branches
fzlzjerry
committed
10ac817
fix: preserve merged increment edge cases
fzlzjerry
committed
593f090
style: group increment helper overloads
fzlzjerry
committed
32b8f14
fix: respect merged history boundaries
fzlzjerry
committed
0a2d8e7
fix: preserve historical merge increments
fzlzjerry
committed
eeeca33
fix: preserve historical inheritance alternatives
fzlzjerry
committed
d30f9b8
fix: handle merged increment edge cases
fzlzjerry
committed
57ffa25
fix: scope increment cache and merge resets
fzlzjerry
committed
b89641e
fix: preserve inherited main branch status
fzlzjerry
committed
464a14a
refactor: address sonar findings
fzlzjerry
committed
0bd47d7
fix: retain ignored main history on descendants
fzlzjerry
committed
a45ebfd
fix: retain side history for ignored merges
fzlzjerry
committed
c4cbebd
test: cover selected stable source tags
fzlzjerry
committed
3c78e8a
fix: preserve commit order across unrecognized merges
fzlzjerry
committed
c28531b
fix: stop history traversal at off-parent base
fzlzjerry
committed
33a7ac1
fix: skip target segments pruned by tags
fzlzjerry
committed
bdafb95
fix: align merge prevention matrix
fzlzjerry
committed
9be4f76
fix: use global fallback for orphaned sources
fzlzjerry
committed
2c41462
fix: preserve main merge floor on descendants
fzlzjerry
committed
6d79cce
fix: preserve merged history ordering and fallbacks
fzlzjerry
committed
85ea15e