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
The implementation of different merge options is on its way.
There should be an option to squash merge the changes at the end of a pull request. This results in a single commit instead of the individual commits plus a merge commit. This is preferred by some development teams to keep the history clear and simple. When this option is available, the user should be able to freely edit the commit message. The ability to do a squash merge should be a configurable option on the target branch, such that users don't accidentally squash to branches, where we don't want it.7 votes
- Don't see your idea?