Skip to content

Instantly share code, notes, and snippets.

@maxmarkus

maxmarkus/pre-commit-hook-merge-conflicts.sh

Created March 24, 2016 13:26
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save maxmarkus/8a81edd58dd65a45731f to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save maxmarkus/8a81edd58dd65a45731f to your computer and use it in GitHub Desktop.
Download ZIP

Stargazers

  1. @shebin512

    shebin512

    Joined on Jun 25, 2014

  2. @jakubzitny

    jakubzitny

    Works for @avocode, @deepnote

  3. @cawal

    cawal

    Joined on Jan 25, 2014

  4. @MuYunyun

    MuYunyun

    Is from Shanghai, China

  5. @Priestch

    Priestch

    Joined on Jul 29, 2012

  6. @br-arruda

    br-arruda

    Is from Brazil

  7. @rodeezy

    rodeezy

    Joined on Aug 5, 2013

  8. @fgodino

    fgodino

    Works for @miluhealth

  9. @mary-priscilla-tw

    mary-priscilla-tw

    Joined on Jun 7, 2021

  10. @RobertAudi

    RobertAudi

    Joined on May 22, 2009

  11. @HamzaRino

    HamzaRino

    Works for @Edurinoapp