Re: Issues running gitmerge

[Jim Porter]

Ok, I've made a couple of changes to fix the merge (see commit 
0df2efa4d69), and then I ran gitmerge successfully and pushed the 
result. Additional details below.

On 8/21/2023 6:03 PM, Po Lu wrote:
> Jim Porter <jporterbugs@gmail.com> writes:
>
> > The failing files are:
> >
> >    ChangeLog.android
> >      The hook rejects files with ChangeLog in the name, but reports the
> >      wrong error due to a (probable) bug in the hook.
>
> ChangeLog.android should be kept.  The hook should be fixed.

Fixed.

> >    java/INSTALL
> >      Whitespace "issues" (which are probably non-issues since these are
> >      part of in-line diffs).
> >
> >    java/README
> >      Extraneous newline at the end.
>
> The hook must be taught to ignore these files.

I've set Git to ignore the whitespace in the former file. Looking more 
closely at the latter, I think the extra newline really is unnecessary, 
so I removed it. However, if I've made a mistake, just let me know.

> I will fix emacs_background.xml.

Thanks.