I'm trying to enable automatic merge branch "dev" after successful build to master. "Watch builds in branches" is set to: +:dev "Merge into" is set to master. After build nothing happens.
Asked
Active
Viewed 2,253 times
3
-
Are the tests all running green? – Wai Ha Lee Apr 08 '15 at 21:42
-
Yes! There is no any message about failing anything – Michal Zubkowicz Apr 09 '15 at 21:14
-
Might be worth getting in touch with JetBrains. They have a reasonable turnaround (took about two days to get back to me when I asked about Resharper recently). – Wai Ha Lee Apr 09 '15 at 21:41
-
2I'll try when it will be sure that is their fault ;) – Michal Zubkowicz Apr 10 '15 at 09:42
-
Having the same issue right now described at http://stackoverflow.com/questions/30141426/teamcity-fails-to-merge-automatically . Maybe you have already found a workaround? – Andrey Pesoshin May 09 '15 at 15:04
-
Sadly not yet. I'll write to support of teamcity. – Michal Zubkowicz May 11 '15 at 08:43
-
@AndreyPesoshin I've created bug report, please vote on it: https://youtrack.jetbrains.com/issue/TW-41012 – Michal Zubkowicz May 11 '15 at 08:47
2 Answers
1
Those settings look correct...
When you say "After build nothing happens" what are you expecting? The UI will not display anything unless the automatic merge fails.
- Have you confirmed in your vcs that it hasn't merged?
- Are you sure the branch names are correct?
- Was the build successful?
- You can check the overview of a build that hasn't merged for a "Failed to merge sources..." message
JonSquared
- 683
- 6
- 19
-
-
I'm expecting that it should merge master branch from current (dev) branch. There is no any message about failing anything. This Build configuration pull changes from dev branch and is running "grunt build" command, after that I want to merge to branch master – Michal Zubkowicz Apr 09 '15 at 10:40
-
Do you mind adding screenshots of the build configuration and a build log of a build that didn't not merge? – JonSquared Apr 09 '15 at 22:39
-
1
I was able to do it the way suggested by @Andrey Pesoshin on Teamcity fails to merge automatically . But it's not working fully the way I wanted to. Simpler is write merge script :/
Community
- 1
- 1
Michal Zubkowicz
- 93
- 1
- 11