Give feedback

merge with merge-commit

Currently, merging from deveo does a fast-forward merge, if applicable.
This causes Jenkins to not trigger a build (https://issues.jenkins-ci.org/browse/JENKINS-17411) from such a merge to master, if the branch was built already.

This issue seems to divide opinions, so please make it a repo-specific setting to do merges fast-forward or merge-commit.

5 votes
Vote
Sign in
Check!
(thinking…)
Reset
or sign in with
  • facebook
  • google
    Password icon
    I agree to the terms of service
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    Kalle RaiskilaKalle Raiskila shared this idea  ·   ·  Flag idea as inappropriate…  ·  Admin →

    2 comments

    Sign in
    Check!
    (thinking…)
    Reset
    or sign in with
    • facebook
    • google
      Password icon
      I agree to the terms of service
      Signed in as (Sign out)
      Submitting...
      • Veli-Matti LuotoVeli-Matti Luoto commented  ·   ·  Flag as inappropriate

        Hello Kalle,

        Currently Deveo in fact does not fast-forward merges done via code reviews. However, fast-forward merges are the default behavior of Git, so I wonder whether you meant something else instead?

      Feedback and Knowledge Base