On Wed, 13 Mar 2013 15:18:58 -0400
wor...@alum.mit.edu (Dale R. Worley) wrote:

[...]
> Modern version control systems incorporate techniques to allow people
> to work effectively without needing locking.  I suggest you revisit
> your perceived need for locking to check whether you really need it.

I would still not rule out the idea of locking right away.
One should understand that conflict resolution by means of merging does
only work well for things which can be merged conveniently.  AFAIK,
this mostly (only?) means plain text files.
Now think of, say, game industly where there are mappers, modellers and
artists who do maps, models and textures.  These things are not easily
mergeable, and are sometimes *huge,* as is the case with textures.
In cases like this, it might be better to really just serialize the
work.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to