notken Posted April 11, 2012 Report Share Posted April 11, 2012 Hi there. We had a pending merge from another branch and also some changes that needed checking in. When we tried to do this through VS 2010 a message popped up saying that we couldn't checkin while there were pending merges unless everything was checked in together. We were trying to check in everything, and all were ticked. There didn't seem to be any way round it within VS 2010. A workaround was to go to the client app and check in there instead, which worked fine. Link to comment Share on other sites More sharing options...
manu Posted April 11, 2012 Report Share Posted April 11, 2012 Hello notken, can you try to review the differences of the last commit (the one you did with the client app) and check if there's some files out of the VS project? Link to comment Share on other sites More sharing options...
notken Posted April 12, 2012 Author Report Share Posted April 12, 2012 Sorry, I'm not quite sure what you mean. Some files out? Link to comment Share on other sites More sharing options...
CodingGorilla Posted April 12, 2012 Report Share Posted April 12, 2012 I think he means that sometimes plastic sees additional changes in the workspace other than those that VS sees. I see this, for example, when I change some installer files (.nsi/.nsh). I think (manu can correct me if I'm wrong) that the Visual Studio plugin only considers files that are a part of the visual studio solution that is loaded. Link to comment Share on other sites More sharing options...
manu Posted April 12, 2012 Report Share Posted April 12, 2012 Amen. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.