mdutt Posted November 25, 2011 Report Share Posted November 25, 2011 Hello Folks! Today I found some strange behaviour when trying to merge back to the trunk from my developer branch. I try to explain it with some screenshots As you can see in the screenshot below Plastic SCM says there are several files to be merged. So far so good - on first sight. When taking a closer look I wondered why there are CS files to be merged - I didn't change anything in these files! When diffing the files I get this message: A merge back from trunk to my developer branch didn't bring any advance... Perhaps you can extract some useful information for your further developement. I'll just check it into the trunk now. Evidently there are no changes so there shouldn't be any risk. Link to comment Share on other sites More sharing options...
manu Posted November 29, 2011 Report Share Posted November 29, 2011 Hi mdutt, thanks for the info! can you check if the source revision has differences with the ancestor revision? You can do it using the merge item context menu on the find merge dialog. Regards, Manu. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.