TexasHawk
-
Posts
6 -
Joined
-
Last visited
Posts posted by TexasHawk
-
-
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!
-
Before I do that, should I do a merge like where I want to take all the source changes (my artist) and not specifically merge them? I feel like I may be doing the merge wrong. I just want to take all their changes on a given prefab, and I want to make sure I'm doing that correctly!
-
...but when I do it, not all of the changes make it. Some do, but some don't. I am currently merging from the source and destination, and it's worked OK so far, but in the last few days the merges seem to be taking some things and excluding some others. Should I only take source in that case? Thanks!
-
Thanks for the reply! The project did migrate fine and all is working well! Thanks!
-
I just started migrating a 15.5 GB Collab project, and I know the screen said about 20 minutes. Is there any way I will know when this process is complete, other than to keep refreshing the cloud respository?
Thanks!
Clearing a 'pending merge link' that is preventing check-in
in Unity 3D
Posted
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!