Skip to content

History / Git Flow

Revisions

  • Add note not to squash and merge when resolving conflicts from a feature branch

    @kenjinp kenjinp committed Dec 5, 2019
    5b54ae1

  • Add a "Naming your branches" section

    @kenjinp kenjinp committed Dec 5, 2019
    0d371b4

  • Add Updating and Resolve conflicts with master section

    @kenjinp kenjinp committed Dec 5, 2019
    9720e57

  • Updated Git Flow (markdown)

    @kenjinp kenjinp committed Nov 25, 2019
    dcd9666

  • Updated Git Flow (markdown)

    @kenjinp kenjinp committed Nov 11, 2019
    a88fbfd

  • Add basic git flow documentation

    @kenjinp kenjinp committed Nov 11, 2019
    67603b0