Skip to content

History

New page

Revisions

  • Drop the note on using git-lltb - it does not work with the replace objects and the process does not require it

    @martyone martyone committed Jun 14, 2024
    ff7d01a

  • Describe the issue with "ours" vs "theirs" and how to deal with it

    @martyone martyone committed Jun 14, 2024
    1be1660

  • Update the diff command

    @martyone martyone committed May 28, 2020
    6d01ef7

  • Use just the master branch for overview

    @martyone martyone committed Jun 14, 2019
    7721b40

  • Mention the command to diff mer-x.y to master

    @martyone martyone committed May 9, 2019
    47252ef

  • Mention git-lltb

    @martyone martyone committed Feb 12, 2019
    6ecf80d

  • Expand more on branching policy

    @martyone martyone committed Sep 19, 2018
    4946317

  • Add initial content; branching scheme

    @martyone martyone committed Jul 15, 2014
    1bea7ae