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;

Instant merge conflict detection in VS Code - YouTube

Would you like to know if your branch has conflicts before you go to merge it in? 💥 If so, make sure you have GitLive installed! #shorts #vscode #software #...

youtube.com

---

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

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.

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.

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