Re: [PATCH 57/89] sched/headers: Split <linux/sched/task_stack> out of <linux/sched.h>

[Geert Uytterhoeven]

Hi Ingo,

On Mon, Feb 6, 2017 at 10:54 PM, Ingo Molnar <mingo@xxxxxxxxxx> 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.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds