Automerge issue

Hi

I have an issue with auto mege. I have a build configuration setup that buils multiple branches. This configuration also have multiple automerge setup.

The triggering branch is development and it auto merges to customer/na/rds and customer/dk/GasTech_NEW

• In the ui i can't see the merge. This has resulted me to look in the teamcity-vcs.log file where I found this, Basicly that there is a merge error. That is fine but I excepted to see this in the UI where the yellow part is. It seems to be silent now. I have seen that in previous versions.
• Also I excepted that the system would go on an try to merge my other branch, but this doesn't happen. I can't see anything in the log regarding this
• Last but not least it would be nice with some more logging in the build configuration log so one could see if the system is trying to match the different automerge rules that has been configured.

10:59:08,265] DEBUG [gers executor 1] - TMobile_StandardPackDeployTest - ExpandITMobile_StandardPackDeployTest [branch: feature/HQ/ionic3]: No pending changes found, skip triggering
[2019-07-17 10:59:08,266] DEBUG [gers executor 1] - TMobile_StandardPackDeployTest - ExpandITMobile_StandardPackDeployTest [branch: master]: No pending changes found, skip triggering
[2019-07-17 10:59:08,786] DEBUG [prio executor 2] - ggers.vcs.git.FetchCommandImpl - Fetch process for (C:\ProgramData\JetBrains\TeamCity\system\caches\git\git-04CBDB35.git, XXX#+refs/heads/customer/na/rds:refs/heads/customer/na/rds ) finished
[2019-07-17 10:59:08,786] INFO [prio executor 2] - ggers.vcs.git.FetchCommandImpl - Git fetch process finished for: XXX in directory: C:\ProgramData\JetBrains\TeamCity\system\caches\git\git-04CBDB35.git, took 8554ms
[2019-07-17 10:59:08,787] DEBUG [prio executor 2] - ggers.vcs.git.FetchCommandImpl - Fetch process output:
[2019-07-17 10:59:00,760] DEBUG - Triggers.vcs.git.GitServerUtil - Git memory mapped index files is off
[2019-07-17 10:59:00,771] DEBUG - s.vcs.git.TransportFactoryImpl - Check available ciphers
[2019-07-17 10:59:01,145] DEBUG - s.vcs.git.TransportFactoryImpl - Turn off ciphers checks, use found ciphers cipher.c2s: aes128-ctr,aes128-cbc,3des-ctr,3des-cbc,blowfish-cbc, cipher.s2c: aes128-ctr,aes128-cbc,3des-ctr,3des-cbc,blowfish-cbc

[2019-07-17 10:59:08,789] DEBUG [prio executor 2] - riggers.vcs.git.RevisionsCache - Invalidate cache for repository C:\ProgramData\JetBrains\TeamCity\system\caches\git\git-04CBDB35.git, new commits []
[2019-07-17 10:59:08,789] DEBUG [prio executor 2] - riggers.vcs.git.RevisionsCache - Invalidate cache for repository C:\ProgramData\JetBrains\TeamCity\system\caches\git\git-04CBDB35.git, new commits []
[2019-07-17 10:59:08,789] DEBUG [prio executor 2] - t.CommitLoaderImpl.Performance - [RevWalk.parseCommit] repository=C:\ProgramData\JetBrains\TeamCity\system\caches\git\git-04CBDB35.git, commit=bc1ec6b7713c5b3f7c4249daa68115f6b7c8fa53, took: 0ms
[2019-07-17 10:59:08,789] DEBUG [prio executor 2] - t.CommitLoaderImpl.Performance - [RevWalk.parseCommit] repository=C:\ProgramData\JetBrains\TeamCity\system\caches\git\git-04CBDB35.git, commit=fb6c03d62aabab2bfbcf114561adcc2f9ea2859c, took: 0ms
[2019-07-17 10:59:08,827] DEBUG [prio executor 2] - iggers.vcs.git.GitMergeSupport - Merge failed with conflicts, root "Github Custom Shops Branches (1)" {instance id=95, parent internal id=15, parent id=Github_Custom_Shops_Branches__1_, description: "XXX#dummyForTc"}, revision bc1ec6b7713c5b3f7c4249daa68115f6b7c8fa53, destination fb6c03d62aabab2bfbcf114561adcc2f9ea2859c, conflicts [Shop/App_Code/RazorGlobalHelper/ProjectHelper.cshtml, Shop/Views/Project/Index.cshtml]
[2019-07-17 10:59:08,827] DEBUG [prio executor 2] - iggers.vcs.git.GitMergeSupport - Merge error, root "Github Custom Shops Branches (1)" {instance id=95, parent internal id=15, parent id=Github_Custom_Shops_Branches__1_, description: "XXX#dummyForTc"}, revision bc1ec6b7713c5b3f7c4249daa68115f6b7c8fa53, destination refs/heads/customer/na/rds
jetbrains.buildServer.buildTriggers.vcs.git.GitMergeSupport$MergeFailedException
at jetbrains.buildServer.buildTriggers.vcs.git.GitMergeSupport.mergeCommits(GitMergeSupport.java:243)
at jetbrains.buildServer.buildTriggers.vcs.git.GitMergeSupport.doMerge(GitMergeSupport.java:158)
at jetbrains.buildServer.buildTriggers.vcs.git.GitMergeSupport.lambda$merge$0(GitMergeSupport.java:81)
at jetbrains.buildServer.buildTriggers.vcs.git.RepositoryManagerImpl.runWithDisabledRemove(RepositoryManagerImpl.java:256)
at jetbrains.buildServer.buildTriggers.vcs.git.GitMergeSupport.merge(GitMergeSupport.java:74)
at jetbrains.buildServer.vcs.impl.MergeManagerImpl.lambda$null$0(MergeManagerImpl.java:5)
at jetbrains.buildServer.serverSide.impl.BaseAccessChecker.runWithDisabledCheck(BaseAccessChecker.java:32)
at jetbrains.buildServer.serverSide.impl.SecondaryNodeSecurityManager.executeSafeCommandLine(SecondaryNodeSecurityManager.java:27)
at jetbrains.buildServer.vcs.impl.MergeManagerImpl.lambda$merge$1(MergeManagerImpl.java:20)
at jetbrains.buildServer.serverSide.impl.BaseAccessChecker.runWithDisabledCheck(BaseAccessChecker.java:32)
at jetbrains.buildServer.serverSide.impl.SecondaryNodeSecurityManager.runSafeNetworkOperation(SecondaryNodeSecurityManager.java:16)
at jetbrains.buildServer.vcs.impl.MergeManagerImpl.merge(MergeManagerImpl.java:13)
at jetbrains.buildServer.vcs.impl.AutoMergeFinishBuildListener.merge(AutoMergeFinishBuildListener.java:8)
at jetbrains.buildServer.vcs.impl.AutoMergeFinishBuildListener.lambda$null$0(AutoMergeFinishBuildListener.java:85)
at java.util.concurrent.CompletableFuture$AsyncRun.run(CompletableFuture.java:1626)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
at java.lang.Thread.run(Thread.java:748)