lkml.org 
[lkml]   [2017]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 57/89] sched/headers: Split <linux/sched/task_stack> out of <linux/sched.h>

    * Geert Uytterhoeven <geert@linux-m68k.org> wrote:

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

    \
     
     \ /
      Last update: 2017-02-07 09:14    [W:3.629 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site