On 11/4/05, Junio C Hamano <junkio@cox.net> wrote: > 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. Yes it works, and cvsimport -k will do the right thing for you. We are tracking projects with several binary files. The only issue as you note is that trading patches with git-format-patch and git-am doesn't quite deal with it. But you can still do it across different git heads with git-read-tree -m as long as your binary file merges are truly trivial. cheers, martin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Fri Nov 04 10:01:29 2005
This archive was generated by hypermail 2.1.8 : 2005-11-04 10:01:33 EST