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

https://app.egghead.io/api/v1/lessons/git-highlight-git-merge-conflict-messages-with-iterm-triggers/subtitles

Highlight Git Merge Conflict Messages with iTerm Triggers

Instructor: [00:00] Open item preferences, select profiles tab, select your profile, and in advanced tab, click edit button in the trigger section. Click plus button, depth irregular expression that will match conflicts and git merge results.

[00:16] Select highlight text in the action column, and select a bright color that will be visible in your screen, for example, orange. Close item settings, and now, merge conflicts are highlighted in your terminal.

Highlight Git Merge Conflict Messages with iTerm Triggers

Share this video with your friends