On Wed, Nov 14, 2018 at 04:52:59PM +0900, Junio C Hamano wrote:
> Denton Liu writes:
>
> > With this fix, the message becomes the following:
> >
> > Merge branch 'master' into new
> >
> > # >8
> > # Do not modify or remove the line
Denton Liu writes:
> With this fix, the message becomes the following:
>
> Merge branch 'master' into new
>
> # >8
> # Do not modify or remove the line above.
> # Everything below it will be ignored.
> #
> #
I discovered a bug in Git a while ago where if one is using
commit.cleanup = scissors, if making a commit after a merge conflict,
the scissors line will be placed after the `Conflicts:` section. As a
result, a careless Git user (e.g. me) may accidentally commit the
`Conflicts:` section.
Here is a
3 matches
Mail list logo
