On Wed, Mar 04, 2009 at 05:56:48AM -0800, Henk wrote: > In our current version control system we lock binairy files when we > edit them. This way other developers know when a file is being > edited. Is there something simular in Git? Or is there another > method to let others now I am currently editing a file? > > We need this only for binairy files, because they cannot be merged. You can't lock files, but perhaps you could specify a custom merge driver to define how those files should be "merged" (for whatever definition you choose). See http://www.kernel.org/pub/software/scm/git/docs/gitattributes.html for details. -- Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html