From: Josh England Date: Fri, 24 Aug 2007 16:11:19 GMT Subject: Re: tracking perms/ownership Message-ID: <1187971879.6357.117.camel@beauty> In-Reply-To: <7vtzqpsy3q.fsf@gitster.siamese.dyndns.org> On Thu, 2007-08-23 at 15:08 -0700, Junio C Hamano wrote: > Of course, you would need to worry about resolving merge > conflicts of gitattributes file, too. I'm still confused on things. So, with all perms/ownership stored as .gitattributes, would mucking around with the index still be necessary? I'm not too sure what to do about merge conflicts. -JE