Re: [Xen-devel] [PATCH v2 1/6] gitignore: Ignore *.orig, *.rej and *.swp files

[Daniel Kiper <daniel.kiper@xxxxxxxxxx>]

On Wed, Nov 04, 2015 at 01:03:56PM +0100, Vladimir 'phcoder' Serbinenko wrote:
> Le 12 août 2015 11:04 AM, "Ian Campbell" <ian.campbell@xxxxxxxxxx> a écrit :
> >
> >
> > (Having written the below I see too late that this is a grub patch not a
> > Xen one, a tag in the subject for such cross posted patches would be
> useful
> > please. Anyway, my opinion counts for very little in this context but I
> > leave it below since already I wrote it. I notice that xen.git#.gitignore
> > _does_ list *.rej, which I think is wrong...)
> >
> > On Mon, 2015-07-20 at 16:35 +0200, Daniel Kiper wrote:
> > > Signed-off-by: Daniel Kiper <daniel.kiper@xxxxxxxxxx>
> >
> > At least *.rej and perhaps *.orig are indicative of a failed patch
> > application, I think I want them to appear in "git status".
> >
> > By way of comparison Linux's .gitignore includes *.orig but not *.rej and
> > Qemu's includes neither.
> >
> > So nack to the addition of *.rej from me. I'm more or less ambivalent
> about
> > *.orig.
> >
> I have to agree. You should clean up *.rej *.orig after fixing conflicts

Thanks for comment on this. Could you review rest of this patchset?
I am working on v3 and it will be nice to take your (and others if
possible) comments into it.

Daniel

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel