26b9b0e2fb
GitHub supports a "rebase" merge mode where it will rebase the PR onto the target branch and fast-forward the target branch to the result of the rebase. Add support for this process to the merger so that it can prepare an effective simulated repo, and map the merge-mode to the merge operation in the reporter so that gating behavior matches. This change also makes a few tweaks to the merger to improve consistency (including renaming a variable ref->base), and corrects some typos in the similar squash merge test methods. Change-Id: I9db1d163bafda38204360648bb6781800d2a09b4
6 lines
107 B
YAML
6 lines
107 B
YAML
---
|
|
features:
|
|
- |
|
|
The :value:`project.merge-mode.rebase` merge-mode is now supported
|
|
for GitHub.
|