Join egghead, unlock knowledge.

Want more egghead?

This lesson is for members. Join us? Get access to all 3,000+ tutorials + a community with expert developers around the world.

Unlock This Lesson

Already subscribed? Sign In

Autoplay

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

    gitgit
    Code

    Code

    Become a Member to view code

    You must be a Member to view code

    Access all courses and lessons, track your progress, gain confidence and expertise.

    Become a Member
    and unlock code for this lesson
    Transcript

    Transcript

    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.

    Discuss

    Discuss