Highlight Git Merge Conflict Messages with iTerm Triggers

Artem Sapegin
InstructorArtem Sapegin
Share this video with your friends

Social Share Links

Send Tweet
Published 6 years ago
Updated 5 years ago

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

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.

~ 9 minutes ago

Member comments are a way for members to communicate, interact, and ask questions about a lesson.

The instructor or someone from the community might respond to your question Here are a few basic guidelines to commenting on egghead.io

Be on-Topic

Comments are for discussing a lesson. If you're having a general issue with the website functionality, please contact us at support@egghead.io.

Avoid meta-discussion

  • This was great!
  • This was horrible!
  • I didn't like this because it didn't match my skill level.
  • +1 It will likely be deleted as spam.

Code Problems?

Should be accompanied by code! Codesandbox or Stackblitz provide a way to share code and discuss it in context

Details and Context

Vague question? Vague answer. Any details and context you can provide will lure more interesting answers!

Markdown supported.
Become a member to join the discussionEnroll Today