Fabien Boucher <fboucher(a)redhat.com> writes:
On Wed, Nov 20, 2019 at 1:45 PM Neal Gompa <ngompa13(a)gmail.com> wrote:
> Can we have Zuul support fast-forward merges? Merge commits are really
> irritating for managing multi-branch (i.e. current Dist-Git package
> maint) workflows.
Yes the "Always merge" option I suggest in the Pagure project settings is
By default, internally, to prepare repositories to be tested, Zuul uses the
strategy to integrate PRs on the target branches. Keeping the commit
strategy similar between Zuul and Pagure project is recommended but apart
specific jobs/use-cases having them different won't cause any issues.
Zuul's "merge" merge strategy corresponds to the default git merge
strategy ("recursive") which will perform a fast-forward if no merge is
required. This is also equivalent to the default in Pagure. I think
that if you set that strategy in Zuul, and disable "Always merge" in
Pagure, you will have matching behavior.