Hello, I am getting the following message trying to switch branch with pending changes:
However I have already enabled this option:
I don’t understand why it can’t switch. Is this a bug? Is there any other explanation?
Thanks
Hi,
Do you have not only locally changed items but also checked-out items? it would explain this error.
Note that it’s not very recommendable to switch with pending changes (even if the items are not checked-out). This problem could potentially happen: https://plasticscmsupport.zendesk.com/hc/en-us/articles/360014970894-The-parent-revision-of-the-item-is-inconsistent-with-the-loaded-one-in-changeset-cs-xxx
We normally recommend you shelve the pending changes before the switch to the branch. Does it help?
Regards.
Thanks for the suggestion, I did have checked out items. However, the versions were exactly the same on both source and destination branch, so I would assume it would be able to move the changes across those branches with no issue.
I did shelve the changes in this case, but it feels like this is extra busywork that just adds meaningless friction to the workflow and should not be required.
I was finding it confusing because it appeared as if sometimes it will work and sometimes it won’t, and I didn’t know what the difference is and why - in this case it seemed like the checked out items may have been preventing it like you said, but that was not clear to me.
Even if it were made clear, I’m still not sure I understand why the switch has to be prevented as like I said they are the same on source and destination branch so should not cause any issue.
Regarding the scenario in the link you posted, I’m again not sure I see why this an issue. Can’t it take the pending changes from the #500 changeset and apply them on top of the #555 changeset like git would? (as long as there are not conflicts)
I don’t really see why it needs to replace the file fully and discard the changes. Nothing needs to be lost in this scenario.
Thanks again