feat: configurable merge method with server-side fast-forward#2101

Open

NNTin wants to merge 2 commits into

AgentWrapper:mainfrom

NNTin:feat/merge-strategy

Commits on Jun 5, 2026

feat: configurable merge method with server-side fast-forward

NNTin
and
claude
committed
fix(scm-github): handle identical branch and protected base in merge-with-ff

NNTin
and
claude
committed