Ever been confused by merge conflicts? So have we. Here's a deep dive into what a merge conflict is, why they can be so confusing and how the new merge editor experience helps.
https://www.youtube.com/watch?v=HosPml1qkrg

https://twitter.com/code/status/1600514845790461953