1×
Become a member
to unlock all features

Level Up!

Access all courses & lessons on egghead today and lock-in your price for life.

Autoplay

    Highlight Git Merge Conflict Messages with iTerm Triggers

    gitgit

    When you merge code in Git using a command line, it’s easy to miss merge conflicts. iTerm has a feature, named triggers, that may help.

    Regular expression I’m using to match conflicts in Git merge results: CONFLICT \([^)]*\).