[zolotarev]

Friction — merge into main needs main checked out

Seen ×0 in 0 task(s) of one project.

merge/deliver --into main refuse unless main is open in a copy; the main copy could not switch (vendored .dpcli on main vs submodule on the feature branch), a fast-forward needs no checkout

Change

• VERSION 31, CHANGELOG
• merge --into a branch open in no copy: fast-forward without a checkout

Sent by dpcli contribute. Anonymized: no project names, paths or quotes.

[github-actions]

VERDICT: accept

• Real friction (main copy cannot switch to main); a fast-forward via update-ref with the old value is safe against lost concurrent updates and refuses diverged targets with a clear hint.
• Test covers both the fast-forward and the diverged refusal; VERSION 31 and the CHANGELOG line are present, with no new dependencies.
• Nit: the PR body says "Seen ×0 in 0 task(s)", and no open feedback issue matches; the evidence is thin, so link the real occurrence next time.
• Nit: --push on this path runs git push with cwd=None (the current copy). That works, but there is no test for it.
• Nit: this path always fast-forwards, while the checked-out path always makes a merge commit (ff=False). The difference is acceptable here, but it is worth a word in the docs.