No video

How To Use GitHub with VS Code in 2021 | Resolve Merge Conflicts | Part 7

  Рет қаралды 15,967

Sam Fromaway

Sam Fromaway

3 жыл бұрын

In this video we will check out how to resolve merge conflicts with Git and Github in VS-Code.
CONTACT:
📱 Facebook - / devworldinfo
🌎 Website - www.dev-world....
📧 Email - contact@dev-world.info
ABOUT THIS CHANNEL:
Dev World is a mix of tutorials and educational videos around Coding, Online Marketing, and Design.
#Coding #Webdesign #Marketing

Пікірлер: 14
@flutterquick
@flutterquick Жыл бұрын
i just want to say .... THANK YOU VERY MUCH
@SamFromaway
@SamFromaway Жыл бұрын
Thanks 🙏
@Tech-Dev
@Tech-Dev 10 ай бұрын
Cheers for this.
@Filipcorobivblenderi
@Filipcorobivblenderi 3 жыл бұрын
Thank you. Your tutorials are amazing, u helped me more than u think :D
@iamtheasad
@iamtheasad Жыл бұрын
Oh my Allah, you are awesome keep up the good content bro.... Don't stop. I learnt a lot of valuable things from these series.
@manuelalejandrogaristozuna3671
@manuelalejandrogaristozuna3671 2 жыл бұрын
Thank you this will help in my internship
@jbridguk
@jbridguk 2 жыл бұрын
Hi, Thanks for the video. You mentioned merging directly on GitHub, but then said that this should only be done for very simple changes. Instead you took a new clone of the repo and then ran the copied command line instructions - which resulted in the same merge conflict showing in vscode. I struggle to see the benefit to doing this rather than resolving the merge conflicts directly in vscode when you merge your changes back to the master. At the end, you have to go to each conflict and reslove in vscode in both cases...then commit and push to github...so I struggle to see the difference?
@moasfour
@moasfour Жыл бұрын
Same, let me know if you knew why is that.
@gambit3904
@gambit3904 2 жыл бұрын
Excellent, I am very grateful for your help!
@srinivaspatnala696
@srinivaspatnala696 2 жыл бұрын
thank you so much for the video
@itamar2272
@itamar2272 3 жыл бұрын
we need more of this!
@tomandreii
@tomandreii Жыл бұрын
Thanks for the vid!
@BeBetterPeople2449
@BeBetterPeople2449 Жыл бұрын
that music is so annoying/distracting
@deniss.3661
@deniss.3661 3 жыл бұрын
Hello! Check the email with a offer (ConveyThis)
Git It? How to use Git and Github
12:19
Fireship
Рет қаралды 745 М.
The EXTREMELY helpful guide to merge conflicts
8:22
Visual Studio Code
Рет қаралды 115 М.
Get 10 Mega Boxes OR 60 Starr Drops!!
01:39
Brawl Stars
Рет қаралды 14 МЛН
👨‍🔧📐
00:43
Kan Andrey
Рет қаралды 10 МЛН
UNO!
00:18
БРУНО
Рет қаралды 4,5 МЛН
How to use Github with Visual Studio 2022
23:46
Programming w/ Professor Sluiter
Рет қаралды 158 М.
Git MERGE vs REBASE: The Definitive Guide
9:39
The Modern Coder
Рет қаралды 103 М.
You are Fixing your Merge Conflicts The Wrong Way in VSCode
8:11
Using Git & GitHub in VSCode: Stage, Commit, and Push
14:51
Max on Tech
Рет қаралды 39 М.
How GIT works under the HOOD?
16:01
Tech With Nikola
Рет қаралды 193 М.
How to use Git inside of VSCode - 2020
12:14
Ihatetomatoes
Рет қаралды 252 М.
Pull Requests in VS Code
10:11
Visual Studio Code
Рет қаралды 107 М.
How to resolve merge conflicts in Git
6:36
Ihatetomatoes
Рет қаралды 275 М.
Get 10 Mega Boxes OR 60 Starr Drops!!
01:39
Brawl Stars
Рет қаралды 14 МЛН