How to resolve git merge conflicts (VSCode)
Concise Developer
•
November 18, 2023
About
No channel description available.
Latest Posts
Video Description
Full VSCode course: https://www.udemy.com/course/mastering-visual-studio-code/?couponCode=OCT2025 How to resolve git merge conflicts (VSCode) 0:00 Video intro 0:50 Create new branch 3:09 Create new pull request 4:09 git checkout main 4:15 git pull 4:30 switch back to conflicting branch 4:48 git merge main 5:10 resolve conflicts 6:54 commit resolved conflicts 7:12 merge pull request
Git & VSCode Essentials
AI-recommended products based on this video
Loading...
Clip in Hair Tinsel, Clips on Hair Tensile Champagne Gold, Pack of 12Pcs, 20 inch Glitter Tinsel Extensions, Festival Fairy (Champagne)
(0)
$16.95
$7.95 delivery Jan 7 - 16
Loading...
Dark Purple Braiding Hair Pre Stretched Yaki Straight 2 Packs 90g/Pack Extra Long Hair Extensions Crochet Braids 26 Inch/66 CM
(9)
$23.39
FREE delivery Thu, Nov 6 on your first order
600+ bought in past month
Loading...
LEGO City Mobile Police Dog Training 60369, SUV Toy Car with Trailer, Obstacle Course and Puppy Figures, Animal Playset for Boys and Girls Ages 5 Plus
(1,256)
$33.98
FREE delivery Sat, Jun 14 on your first order
200+ bought in past month