DEV Community

Cover image for Instant merge conflict detection in VS Code
Agnieszka Stec for GitLive

Posted on

18 6 5 5 7

Instant merge conflict detection in VS Code

Would you like to know if your branch has conflicts before you go to merge it in? 💥
If so, check out our newest video or continue reading 👀

TLDR;


1️⃣ To get started, make sure you have the GitLive extension installed.

Image description

2️⃣ Now when you open a file from your repository you’ll see the changes from all other branches in the gutter of your editor.

Image description

3️⃣ You can roll over the affected lines to see the details of the change, the author and the branch the change is coming from, or even cherry-pick the changes into your version of the file.

Image description

4️⃣ And if you make a conflicting change in the same place you’ll get this bright red indicator instantly showing you the conflict!

Image description

Image of Datadog

Create and maintain end-to-end frontend tests

Learn best practices on creating frontend tests, testing on-premise apps, integrating tests into your CI/CD pipeline, and using Datadog’s testing tunnel.

Download The Guide

Top comments (0)

Eliminate Context Switching and Maximize Productivity

Pieces.app

Pieces Copilot is your personalized workflow assistant, working alongside your favorite apps. Ask questions about entire repositories, generate contextualized code, save and reuse useful snippets, and streamline your development process.

Learn more

👋 Kindness is contagious

Discover a treasure trove of wisdom within this insightful piece, highly respected in the nurturing DEV Community enviroment. Developers, whether novice or expert, are encouraged to participate and add to our shared knowledge basin.

A simple "thank you" can illuminate someone's day. Express your appreciation in the comments section!

On DEV, sharing ideas smoothens our journey and strengthens our community ties. Learn something useful? Offering a quick thanks to the author is deeply appreciated.

Okay