Resolve Merge Conflict in Visual Studio Code
HTML-код
- Опубликовано: 15 июл 2024
- Got a merge Conflict after doing git pull or merge? Visual Studio Code can help you! Twice!
There are mainly two different ways of handling conflicts on vscode, inline or three-way. I will show you both so you can decide which one you like the most!
_______________________________
Support my work: github.com/sponsors/Balastrong
Hit like and subscribe for more content! :D
Join the Discord community! Here's the invite: / discord
You can also follow me on the other platforms:
Twitter: / balastrong
TikTok: / balastrong
dev.to: dev.to/balastrong
GitHub: github.com/Balastrong
Instagram: / devbalastrong
_______________________________
TIMESTAMPS
00:00 Two possible solutions
00:29 Inline editor
01:31 Inline editor - Advanced
02:36 Three-way editor
04:23 Three-way editor - Advanced
05:02 Continue after a conflict
05:37 Restart the merge
06:02 Improve the UI
_______________________________
Sound effects from www.zapsplat.com
#vscode #visualstudiocode #merge 
Наука
Thanks for watching this video! My name is Leonardo and I talk about Web Development and Open Source. If you liked this video, check out my channel and Subscribe! See you in the next one ❤
Maan amazing video, you explain everything in detail and you help me so much, your channel deserve to have many more subs and and I wish you that, keep it up! Big greeting from Serbia! :)
Thank you so much! ❤️
Feel free to talk about the channel with your friends/colleagues, it would help me a lot! :)
Awesome video. Very well put together. Thanks so much man
Thank you so much for the kind words! And welcome to my channel :D
Excellent explanation. Thanks.
Thank u bro. I have been avoiding resolving merge conflicts at my internship until this vid 😅
You're no longer an intern now, you're able to solve merge conflicts... you have the power! 😂
Glad this helped!
Man, that helped a lot! Thanks for the vid)
Thanks, glad to hear it helped! I put a lot of effort in my content and it's great when people enjoy that ❤️
Welcome to my channel :)
Great explanation! You explain things very thoroughly.
Hey Fred, thank you! :D
Amazingly clear; thanks!
Thank you, glad it helped! I make a lot of tutorials and how-to videos, it's great to hear they're helping people :D
Thanks man
Thank you!
Thanks for watching and welcome to my channel! :)
informative
thanks buddy
Thank you and welcome to my RUclips channel :D
@@DevLeonardo keep going your way of teaching is amazing
You're so kind, thanks! ❤️
Thank you ever so much. Sort and useful.
I do not have the instruction Git Abort Merge, I do have Git clone, Git merge, etc. Do you know if I need to install or activate anything else?
Thank you in advance
Helped me with that abort merge option, that i was looking in UI
thanks
That's great to hear! :D
Yeah, knowing how to abort a merge can save you from a really bad situation!
Which one do you like the most? Old inline UI or the new three-way editor?
Inline ui is comfortable but I would try the new way to see if it works better in my workflow (once I code again)
New to VS Code so liking the new 3-way editor
Looks like it is not a 3 Way Merge. Currently I am looking for a 3 Way merge with Base,Version1,Version2 and Automerge like K3Diff but could not find anything so far for VSCODE.
in a 3-way merge I should be able to see: base version, my changes, conflicting changes, result. 4 windows. Here, only 3 windows - wtf?
Thanks for the comment! :)
On the top-right corner of the merge editor there's the "3 dots button", if you click it you can open a menu where you can toggle if you want to see the base version or not.
bro what the hell is Merge branch 'main' of this is pissing me off so badly