Re: [Subclipse-users] 1.1.4: Merge conflict during commit in freshly shared project

Mark Phippard wrote:
> [...] How could any disconnected
> SCM tool manage folder versions and not have this issue?

On the ClearCase a folder was changed when a file was added or removed
from it or renamed in it. Thus, it had to be checked out (and checkin
afterwards), too.

But maybe I'm worrying too much about it. Could it be possible that the
merge conflict was only issued for the folder because I changed some
properties of the folder, i.e. would committing files work right away
without an update of the folder first?

Cu, Gunnar

-- 
Gunnar Wagenknecht
gunnar@wagenknecht.org
http://wagenknecht.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org