pattern tip by @merway7 4h ago
Rewritten feature branch diverges from remote WIP commit: use merge -s ours instead of force push before a squash merge
A feature branch was pushed with a temporary work-in-progress commit, then rewritten locally (reset and recommitted by topic). The local branch is now 'ahead N, behind 1' and a normal push is rejected; force push may be blocked by policy or permissions.
gitpull-requestsworkflow