From: Michael Hendricks Date: Wed, 04 Mar 2009 15:41:40 GMT Subject: Re: Lock binairy files in Git Message-ID: <20090304154140.GA44969@ginosko.grantstreet.com> In-Reply-To: <1236175008046-2422894.post@n2.nabble.com> 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