* Geert Uytterhoeven <ge...@linux-m68k.org> wrote:
> Hi Ingo,
>
> On Mon, Feb 6, 2017 at 10:54 PM, Ingo Molnar <mi...@kernel.org> wrote:
> > Wondering why Git allowed me to be so stupid with those leftover merge
> > markers.
> > Git usually doesn't even allow me to commit them so I have these tuned out
> > as a
> > possibility. This was just a regular git rebase -i flow, to back-merge
> > fixes and
> > reorder/squash patches - nothing fancy that I remember - only the occasional
> > --onto option. I'm using Git 2.7.4.
>
> Git complains about the merge conflicts, and refuses to commit the result
> as long as you haven't resolved them, but it will happily commit everything
> you add using "git add -u", incl. merge markers.
Hm, it should really force that via 'git add -f' or such. The merge markers are
_very_ infrequent as naturally occuring source code lines even on a per line
basis
- and especially the combination of them should be exceedingly unique.
I frequently use:
git add $(git ls-files -m)
... to stage edits without comitting them, probably that workflow is what
caused
this bug.
Thanks,
Ingo
