Re: Why can't commit attempt a merge automatically?

On Mon, 2004-10-11 at 13:06, Greg Goodrich wrote:
> Why is it that prior to each commit I need to do an update/merge
> process? I can understand the necessity if there are conflicts, but
> this seems like a bit of a pain if the changes that happened are not in
> conflict with each other. It seems to me that if I change a file, I
> should be able to just commit it, and then if someone else had snuck a
> change in "under" me, that subversion would quietly merge the files
> together, and assuming no conflict, go about its business.

On my projects, the developer is expected to have tested what is being
checked in - if there were an automatic merge, then there's been no
opportunity for that testing.

-- 
Scott Lawrence
Consulting Engineer
Pingtel Corp.   
sip:slawrence@pingtel.com
+1.781.938.5306 x162
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org