Skip to content

Add expected_old_oid to UserMergeToRefRequest

Extracted out of !5897 (closed) based on !5897 (comment 1438633612).

This can be used to guard against races in composite git operations that act as a single user-facing operation. The motivation here is the construction of merge request refs using "semi-linear" merges with automatic rebase prior to the creation of the merge commit.

See gitlab#26996 (closed)

Merge request reports

Loading