Skip to content

History / Merge Conflicts Resolving and Remembering them

Edit page New page

Revisions

  • merge-conflicts: format "From the git List" links as a list

    @phil-blain phil-blain committed Feb 14, 2022
    1d98017

  • Fix whitespace issues Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

    @dscho dscho committed Dec 19, 2020
    ca955c8

  • Use links referring to the default branch in a generic way Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

    @dscho dscho committed Jun 17, 2020
    b2f4a75

  • commas,

    Philip Oakley committed Apr 6, 2019
    b6ea546

  • more (~last of not many) git list references

    Philip Oakley committed Apr 6, 2019
    1a4f95c

  • discuss what needs remembering, and an alternate description of how the fake merge works, and how to 'replace' it.

    Philip Oakley committed Apr 6, 2019
    9b05187

  • Updated Merge Conflicts Resolving and Remembering them (markdown)

    Philip Oakley committed Apr 6, 2019
    82ba760

  • Updated Merge Conflicts Resolving and Remembering them (markdown)

    Philip Oakley committed Apr 6, 2019
    a4d9640

  • Updated Merge Conflicts Resolving and Remembering them (markdown)

    Philip Oakley committed Apr 6, 2019
    406c667

  • more rerere-train'ing stuff

    Philip Oakley committed Apr 5, 2019
    f4e3dec

  • rerere-train

    Philip Oakley committed Apr 5, 2019
    2df998e

  • and rerere.autoupdate true

    Philip Oakley committed Apr 5, 2019
    fee04e8

  • What I'm Learning Is - Hopefully this will bridge the gap for new 'devs to try out the Upstream->GfW->personal release process.

    Philip Oakley committed Apr 5, 2019
    ee55118