Skip to main content
HashnodeAgnieszka's blog

Command Palette

Search for a command to run...

Early Merge Conflict Detection Across All Branches in VS Code

Published
•2 min read
Early Merge Conflict Detection Across All Branches in VS Code
A
Agnieszka

@ GitLive

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.

#programming#git#developer#software-development#web-development

Comments (6)

Join the discussion
F
Flatley Richie2y ago

When you have the appropriate person by your side, you won't need that other 80 percent of the time. This place, run 3 is where I was able to find the joy I was looking for. They were able to tell me the answer, which has made it possible for me to have delight each day, despite the long and difficult hours I spend at work.

1
R
Ronald Robbins2y ago

My method is what made me successful. Both the headline and the rest of the material need to be interesting for it to work. geometry dash unblocked

R
Reilly Rudolph2y ago

The article in question exhibits a high level of quality. In my opinion, this particular entry stands out as one of the most exceptional pieces of writing I have encountered. basketball stars

T
Theodore Evans2y ago

I was told about this site by a friend, and when I found your writing, I was very impressed. I'll come back often now that I've saved it fnaf

E
Ericbeatric Mark3y ago

The material you provide is quite beneficial to me and everyone else; I frequently watch them to gain knowledge and then play puppet hockey for fun; this is a highly intriguing hockey game.

S
Snow Rider 3D3y ago

wow, great post. it gave me a lot of useful information. I look forward to your next posts. io games wordle

More from this blog

Agnieszka's blog

11 posts