From: Michael Hendricks <michael@ndrix.org>
To: Henk <henk_westhuis@hotmail.com>
Cc: git@vger.kernel.org
Subject: Re: Lock binairy files in Git
Date: Wed, 4 Mar 2009 08:41:40 -0700 [thread overview]
Message-ID: <20090304154140.GA44969@ginosko.grantstreet.com> (raw)
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
prev parent reply other threads:[~2009-03-04 15:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-04 13:56 Lock binairy files in Git Henk
2009-03-04 14:15 ` Johannes Schindelin
2009-03-04 15:41 ` Michael Hendricks [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090304154140.GA44969@ginosko.grantstreet.com \
--to=michael@ndrix.org \
--cc=git@vger.kernel.org \
--cc=henk_westhuis@hotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox