Highlight Git Merge Conflict Messages with iTerm Triggers

Artem Sapegin
InstructorArtem Sapegin

Share this video with your friends

Send Tweet

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