DEV Community

Cover image for Early Merge Conflict Detection Across All Branches in VS Code
Agnieszka Stec for GitLive

Posted on

Early Merge Conflict Detection Across All Branches in VS Code

We are happy to announce that GitLive's flagship feature, early merge conflict detection, now works across all branches in VS Code! 🎉

When we first introduced real-time merge conflict detection, only the changes from each of your teammates’ current branch were shown in the gutter. This meant you could miss a merge conflict from changes in a branch that is not currently being worked on, for instance, changes from a PR waiting for review. Now the change indicators in the gutter of the editor show changes from all branches that contain changes compared to your current branch.

And, as before, and as long as you are not in offline mode, this includes the unpushed changes of your teammates that are also not in offline mode for real-time, instant merge conflict detection!

Image description

New gutter indicator filters

Previously you had a simple switch to show or hide the indicators you see in the gutter of the editor. Now, similar to the team window, you can filter the change indicators shown in the gutter of your editor by type.

It’s worth noting that these filters are independent of the team window filters, but when you change the team window filters the gutter indicator filters are automatically updated to match (but not vice versa). To open the gutter filters menu, click on the GitLive icon in the upper right corner of VS Code.

Image description

🔸 Pushed Changes. Turning off pushed changes will hide the indicators coming from the pushed changes on other branches.
🔸 Unpushed Changes. Turning off unpushed changes will hide the indicators coming from the unpushed changes of your teammates.
🔸 Non-conflicting changes. On by default, turn off non-conflicting changes to only show conflicts in the gutter.
🔸 Include stale changes. By default, changes from branches that have not been modified in 3 months are hidden, turn this on to show them.

👉 Both pushed and unpushed changes are on by default, turn both off to hide the indicators completely

That’s it for now, we would love to know what you think of these updates and how we can make GitLive better for you, so please reach out via the comments section below.


Don't have the GitLive extension installed yet? You can find it here, and if want to learn more about the latest release, check out this blog post.

Discussion (14)

Collapse
joelbonetr profile image
JoelBonetR

I find this interesting and I'll probably take a try sonner rather than later, specially now that GitKraken (which also has teams and early merge conflicts detection) will drop boards feature and I'll need to pick a replacement tool 👌🏼😁

Collapse
stecagnieszka profile image
Agnieszka Stec Author

Thanks! Would be great to know what you think, so don't hesitate to reach out with any questions or feedback you may have :)

Collapse
joelbonetr profile image
JoelBonetR

Sure! that's the good thing on the community 😀
I'll take a try on it on my PC first as I've some constraints to use new software at work, then I can check whether to recommend it or not to the company.

I am checking this and wondering if is there any free trial so I can check that Instant Merge Conflict Detection

Thank you

Thread Thread
stecagnieszka profile image
Agnieszka Stec Author • Edited on

Yes, 30-day free trial is included, so in order to test it you can just go ahead and install the app :)

Thread Thread
joelbonetr profile image
JoelBonetR

Perfect, thank you! :)

Collapse
thomasbnt profile image
Thomas Bnt

Hello !
Probably better if you share this on VSCodeTips, part of the Forem network of communities dedicated to this IDE. You could find interesting topics, sharing about plugins and themes, and any other kind of topic around this software.

Collapse
stecagnieszka profile image
Agnieszka Stec Author

Thanks!

Collapse
thomasbnt profile image
Thomas Bnt

Good post!

Collapse
andrewbaisden profile image
Andrew Baisden

Thanks for this!

Collapse
raibtoffoletto profile image
Raí B. Toffoletto

Didn't know about this! Looking forward to trying it!

Collapse
stecagnieszka profile image
Agnieszka Stec Author

Happy to hear this! Feel free to reach out if you have any questions or feedback!

Collapse
gzamann profile image
Gulshan Zaman Khan

Hey, this is quite helpful! Thanks ✨

Collapse
stecagnieszka profile image
Agnieszka Stec Author

Happy to hear that! Feel free to reach out if you have any questions :)

Collapse
abdurrkhalid333 profile image
Abdur Rehman Khalid

That cools super cool, I have not read the whole article but I read the title and I am not excited to look deeper into the capabilities of the GitLens thank you for specifically mentioning this feature.