Parallel AutoMerge can report MERGED while dropping a merge commit #3285
skudr opened 46 minutes ago

On OneDev 17.0.2, we observed four lost merges among approximately 300 merged pull requests over two weeks. In every incident, several pull requests targeting the same branch became mergeable within the same second. All were marked MERGED, but at least one merge commit was absent from the target branch; the missing commit was also absent from the repository despite being reported as the merge-preview commit.

Expected behavior: serialize concurrent merges to the same target branch, or do not report a pull request as MERGED unless its merge commit is present in the target branch.

1/1
Type
Bug
Priority
Major
Assignee
Affected Versions
17.0.2
Labels
No labels
Issue Votes (0)
Watchers (2)
Reference
OD-3285
Please wait...
Connection lost or session expired, reload to recover
Page is in error, reload to recover