Complete new feature ✅ Make Git commit ✅ Merge conflict 🔃🛑 Ugh 😫 VS Code can help solve merge conflicts visually. Learn how 👉 youtu.be/ybCxPHzRJfA

@code Any plans for 3 way merge? Only thing stopping me from using the inbuilt tooling

@code Vscode is the best for web development. #100DaysOfCode #BlackTechTwitter #javascript #Python #NodeJS #CodeNewbie #vuejs #Vue #reactjs

@code I lacks a visual interface that list the conflicts in a file. I'm tired of using the "Show next conflict" command 😔

@code Aww, this video would be helpful with audio too!

@code An irresistible feature of VSCode

@code I still think this can be handled smarter. Looking at what is coming from when. Whe I branc and somebody commits something it would be logical to have that be the base I'm going to write on top of.