Atlassian Stash：是否可以防止合并包含合并的请求请求？

Question

Some people in my team use git pull to sync their feature branches with master during development.

Due to that, pull requests end up having multiple merges, and as a result it's sometimes hard to reason about the code in the pull request and even harder when reviewing history in gitk .

Preaching to them about advantages of using git fetch && git rebase or git pull --rebase doesn't help, so I'd like to set a rule in Stash config panel to prevent anyone from merging pull requests that contain merge commits themselves .

Is there some Stash plugin available that will make it possible?

I want to enforce the rule via automated check, so that I don't have to be "that guy" who always complains (if "MERGE" button is disabled, it's easier to enforce the convention).

Note that I am not the only one with merge privileges and I don't want to be the gatekeeper.

Edit:

It seems this plugin is what I was looking for. I will need to have a look at it.

Answer 1

我前一段时间写了Stash插件 ，我认为可以做您所描述的事情。