Quantcast
Channel: TeamCity : Powerful CI/CD for DevOps-centric teams | The JetBrains Blog
Viewing all articles
Browse latest Browse all 916

Comment on Automatic Merge by Hao Li

$
0
0

We are using this feature in our CI process and it works as described, which is great!

I’d like to make a feature request so this would fit our development model even better. Basically we would like to validate every change before it is merged into the shared branch, and we want the merge to always be a fast-forward merge (so what’s been validated pre-merge is exactly the end result of the merge). We are willing to manually deal with the occasional re-basing if fast-forward is not possible.

One possible way to get us that is to add an additional choice of “Use fast-forward merge only” to “Merge policy”, in addition to the two existing choices of “Always create merge commit”, and “Use fast-forward merge if possible”.

If we make that choice, and the merge fails, the entire build would fail.

Thanks!


Viewing all articles
Browse latest Browse all 916

Trending Articles