From: Junio C Hamano <junkio@cox.net>
Date: Thu, 03 Nov 2005 22:49:50 GMT
Subject: Re: binary safe?
Message-ID: <7v7jbpbb3l.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <86br115r0z.fsf@blue.stonehenge.com>

merlyn@stonehenge.com (Randal L. Schwartz) writes:

> I presume emailing diff-patches is out of the question, but if all I'm
> doing is git-push and git-pull (using the shared central repository
> model), and if I'm stupid enough to have a merge error it's OK to just
> blow up on a binary file, will everything else work fine?

It should.  I trust git well enough to track some png files in
my day-job project.