CrossRiverGames Posted June 18, 2015 Report Share Posted June 18, 2015 I'm having a bit of an issue here. I'd like to check in my changes to a given branch, but the PlasticSCM client claims there have been other changes since the last checkin (there were not) and I would need to merge. I tried reverting to the saved changeset and then checking in my changes, but the same problem occurred. Is there a way to reset the workspace to that changeset so I can check in my changes? Thanks! Link to comment Share on other sites More sharing options...
SilverKnight Posted June 18, 2015 Report Share Posted June 18, 2015 Best way I've found to get around something like that is to shelf the change set, then switch to the desired location/branch, then merge the shelf back to the workspace. After merge, commit changes. Link to comment Share on other sites More sharing options...
calbzam Posted June 19, 2015 Report Share Posted June 19, 2015 Hi, Yes, this workaround should work. Anyway, if there are not file conflicts, you can just drive to the pending changes view and click on "View new changesets" and update your workspace with the new content. Regards, Carlos. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.