Join us

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, make sure you have GitLive installed!

๐Ÿ”ธ Indicators in the gutter of your editor show the changes others are making. Computed from all active branches, the indicators update as you and your team code together.

๐Ÿ”ธ Get notified the moment you make a change that conflicts with another branch. Compare their changes to your own and cherryโ€‘pick individual changes directly into your local files.

Only registered users can post comments. Please, login or signup.

Start blogging about your favorite technologies, reach more readers and earn rewards!

Join other readers and claim your FAUN account now!

User Popularity



Total Hits



Mentioned tools