Go ProSign in

This Lesson is for Members

Subscribe today and get access to all lessons! Plus direct HD download for offline use, enhances transcripts, member comment forums, and iTunes "podcast" RSS feed. Level up your skills now!

Unlock This Lesson

Already subscribed? Sign In

Hide playlist

    Highlight Git Merge Conflict Messages with iTerm Triggers

    Artem SapeginArtem Sapegin

    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 \([^)]*\).

    You must be a Member to view code