We recently moved from SVN to git. We work with a main “release” branch (master), and feature branches for every feature a dev is working on.
In TeamCity we have a project for every feature branch, and of course a project for the master.
When we worked with SVN, whenever someone merged from master to his feature branch or vice-versa, the merge was treated by TeamCity as one commit. Now, with git, every merge causes TeamCity to show all of the commits that came with this merge.
This causes some problems, for example when someone merge from master to his feature branch, and now his TeamCity project shows “283 pending changes” due to that merge, if builds fail, the authors of these changes will be notified, as if they did these changes on the feature branch.
Is there a way to tell TeamCity to treat git merges as single commit?
We could solve it using squashed merges but that’s something we would really like to avoid.
These are two possible solutions:
One way to solve this (though possibly very awkward, depending on your situation) is to notify users on the level of a build configuration as opposed to notifying who committed/was merged. Create separate build configurations for different topic branches and configure notification per build configuration so that only the ‘owner’ of the topic branch is notified.
Less sure, but worth a try: You could configure notification per topic branch(es), e.g. by wildcard patterns on the branch path. This should be possible by means of a DYI custom notifier plug-in that uses e.g. the branch name property, teamcity.build.vcs.branch.<my_vcs_name>.
A specific limitation of TeamCity email notification (it should be easy to support) is that you can not filter notifications by a combination of build configuration and ‘Ignore failures not caused by my changes’. Then at least you could configure the build for the main branch so that committers are notified, and create specific settings only for the topic branch projects.