TexasHawk Posted April 6, 2021 Report Share Posted April 6, 2021 We have run into a strange issue - my programmer tried to merge from a higher branch into his branch to get the latest changes, and it appears that he got all the files in his workspace; however, when he's trying to do his latest check-in, he gets an error about a 'pending merge link' and a short dashed line in the Branch Explorer connecting, showing the previous merge. We don't see how to resolve this issue. Can someone give any guidance about 'pending merge links' and how to clear or resolve them? Thanks! Link to comment Share on other sites More sharing options...
calbzam Posted April 6, 2021 Report Share Posted April 6, 2021 Hi, Could you attach an screenshot of the error message? Are you using Xlinks? Could you try to checkin via console? "cm ci --all". Regards, Carlos. Link to comment Share on other sites More sharing options...
TexasHawk Posted April 6, 2021 Author Report Share Posted April 6, 2021 Not using Xlinks. We resolved it by doing the check-in via console. My programmer researched it and apparently it was caused by a 'merge deadlock' that's been an issue for almost 4 years. It appears to be a UI bug, not explicitly an engine bug. Thanks for the quick reply! 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