diegohb Posted October 13, 2022 Report Share Posted October 13, 2022 When trying to merge from branch to main using teamcity "merge branch", the following error occurs:Merging process failed: Failed to merge sources in VCS root DummyPlasticVCSRoot. Merge error Cannot find a VCS name of the branch '/main/task013' in VCS root "DummyPlasticVCSRoot" {instance id=70, parent internal id=8, parent id=Testing_DummyPlasticVCSRoot, description: "PlasticSCM: br:/main@TestVCSRepo.One@****@cloud"}, build #33.122 {build id=817, buildTypeId=Testing_DummyBuild}. Skip merging this VCS root sources.. Link to comment Share on other sites More sharing options...
diegohb Posted October 13, 2022 Author Report Share Posted October 13, 2022 It only happened with one branch. I'm going to keep open to see if I find it again and see a pattern. Link to comment Share on other sites More sharing options...
calbzam Posted October 14, 2022 Report Share Posted October 14, 2022 Are you aware of the mergebot feature? https://www.plasticscm.com/mergebot-devops Link to comment Share on other sites More sharing options...
diegohb Posted October 14, 2022 Author Report Share Posted October 14, 2022 Yes but can't find the configuration admin pages for it.. also, I am a fan of the integration role model where builds are carefully put together from finished/tested branches instead of letting the sequencing of builds to rely on when developers complete the work (trunk-based model). In my case, most times integrator will create the merges to main merging 2 or more branches to generate a build but in some cases it will be convenient to merge single branch directly from teamcity. Link to comment Share on other sites More sharing options...
Recommended Posts
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!
Register a new accountSign in
Already have an account? Sign in here.
Sign In Now