Here is the scenario that I would like to implement:
Currently, we have fast forward disabled, and approval clearing is enabled.
We have a large number of developers on our project, so we're usually dealing with 20-30 pull requests a day.
The issue we run into is that when a PR is merged, subsequent open PRs start showing merge conflicts. The submitter then has to rebase, then push. This clears all approvals, so the developer has to get approvals all over again.
What I would like to do is leave approval clearing enabled, and also enable fast forward.
But the two following business rules apply:
- Approvals must not be cleared on a fast forward merge in which no other changes were made.
- Approvals must be cleared if there were changes other than those needed to satisfy a fast forward merge.
Does Bitbucket know that a particular commit is a fast forward? And can it tell if additional changes have been made outside of the fast forward, but submitted with the fast forward commit?
Does anyone have any ideas on where I can start with this? Or basic logic that needs implemented in Bitbucket?
