Automate Git merge in continuous integration but fail if there are merge conflicts [closed]

Question

The team I am working with would like to use continuous integration to automatically merge two git branches. However we want the continuous integration job to fail if there are merge conflicts, so that the developers can run the merge manually and resolve any issues.

Has anyone had experience of this kind of setup (ideally with TeamCity, but any CI server would be interesting)?

Answer 1

This can be achieved in TeamCity by using the Automatic Merge Build Feature

The merge will only be performed after a successful build, but if there are any conflicts during the merge it will subsequently fail the build.

More details can be found here - TeamCity Documentation

Hope this helps.