Automatic merge with multiple VCS Roots
Hi,
We would like to have a dummy project that merge the master branch into one of our feature branch every day. We have several git repositories where we would like to implement this.
We set up the "Automated merge" feature on a project with a dummy build step, and attached our 3 repositories to it. It works, but only for one of our VCS root. The others are ignored. It is not clear from the documentation, so can you confirm that the automated merge only works on one VCS root? Or is it a bug/configuration problem?
Best regards
Please sign in to leave a comment.
Hi Simon,
thanks for your request. Automatic Merge will normally only merge one branch. If you have multiples, you would need to add multiple instances of the build feature to your configuration, but there are some limitations to how it would work:
-The root must support automatic merge (I assume they do in your case, but just to make sure)
-The branch being built should be different than the target branch (this should be rather obvious)
-If none of this happens, the teamcity-vcs.log should contain information about the commits and merges involved in the process, so sharing that information would be useful.
Hi,
Sorry if I wasn't clear: we have 3 roots:
VCS1, VCS2, VCS3
All three roots have a branch "long_feature" and a branch "master".
Every day I want to merge "master" into "long_feature" on all three VCS root. So I made a dummy project with a post-build step to merge "master" into "long_feature", and attached all 3 roots to it.
When run, this dummy project only performed the merge in VCS1, not in the other roots.
In the end, I created 3 projects, one for each VCS root, and it worked.
Now I just want to know:
Should I expect Automated merge to merge ALL roots or just one? It is not clear from the documentation.
Hi Simon,
Yes, if all matches, then it should be expected that it should merge all. Could you please send us the teamcity-vcs.log and a screenshot of the automatic merge configuration using the submit a request button on the top of this page?