LoganBarnettASU Posted May 25, 2012 Report Share Posted May 25, 2012 I'm trying to checkin some changes and deletes. It brings up a merge window. This is ok since someone else made some changes recently and understandably I have to do a merge. I click Merge Now. I'm then delivered to the merge conflict window. It says "The merge search has finished. No merges have been detected.", but if I go press Process all merges, nothing happens. Closing the window just allows me to start this process all over again. I tried changing the merge options and clicking Recalculate merge anytime I made a change but I haven't been able to make it show any conflicts or otherwise allow me to proceed. The other person's commit is over some files I didn't change so it should auto-merge just fine. Is this somehow intended behavior or a bug? If it is a bug, what can I do to move forward? A screenshot is attached. Link to comment Share on other sites More sharing options...
psantosl Posted May 26, 2012 Report Share Posted May 26, 2012 Hi, Sorry for the delay. Let's see, there's something weird in there, definitely. Now, let's try to figure out how to solve it. 1- You're trying to checkin and you can't, it basically means somebody is working on the same branch you're working on. Try to update instead of checkin. It should run a "merge update", bring the new changes (if they do not collide) and let you checkin. Let me know if it works. 2- If it doesn't, then try the following: shelve your pending changes (it is a new feature in 4.1), then update, then apply the shelve. http://codicesoftware.blogspot.com/2012/02/shelving-stashing-introduced.html Let me know if it works. Link to comment Share on other sites More sharing options...
LoganBarnettASU Posted May 29, 2012 Author Report Share Posted May 29, 2012 Unfortunately I had to rebuild the workspace to move on at the time. However, this isn't the first time this has come up. I'll post the results of update/shelving if/when it happens again. Thanks for the help! Link to comment Share on other sites More sharing options...
manu Posted May 29, 2012 Report Share Posted May 29, 2012 One question Logan, are you using Xlinks? are the checkouts under xlinks? If so what version are you using? Link to comment Share on other sites More sharing options...
LoganBarnettASU Posted May 29, 2012 Author Report Share Posted May 29, 2012 My version is 4.1.10.268-London. I'm not using XLinks at the moment (we're waiting on subdirectory and head tracking support). Link to comment Share on other sites More sharing options...
manu Posted May 30, 2012 Report Share Posted May 30, 2012 Ok, I was asking this since we fix a similar issue regarding xlinks. Please, if it happens again follow Pablo's recommendations. Link to comment Share on other sites More sharing options...
LoganBarnettASU Posted July 9, 2012 Author Report Share Posted July 9, 2012 Just FYI this came up again for us and we tried Pablo's option #1. It said we had pending changes and couldn't update. So we tried option #2 and it looks like the shelve apply worked cleanly. Thanks for the help! Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.