Git & GitHub Tutorial for Beginners #9 - Merging Branches (& conflicts)

preview_player
Показать описание
Hey all, in this git tutorial I'll show you how to merge branches back into the master branch. I'll also show you what to do when you encounter a git conflict.

----- COURSE LINKS:

---------------------------------------------------------------------------------------------
Related tutorials:

----- NODE.JS TUTORIALS

============== The Net Ninja =====================

================== Social Links ==================

  1. Net Ninja
  2. git
  3. github
  4. git tutorial
  5. git tutorial for beginners
  6. github tutorial
Рекомендации по теме
Git and GitHub 0:46:19

Git and GitHub Tutorial for Beginners

Git and GitHub 1:08:30

Git and GitHub for Beginners - Crash Course

Git Tutorial for 1:09:13

Git Tutorial for Beginners: Learn Git in 1 Hour

Git Tutorial For 0:19:25

Git Tutorial For Dummies

Complete Git and 1:15:22

Complete Git and GitHub Tutorial for Beginners

Git It? How 0:12:19

Git It? How to use Git and Github

Git Tutorial for 0:43:06

Git Tutorial for Beginners - Git & GitHub Fundamentals In Depth

Git Explained in 0:01:57

Git Explained in 100 Seconds

Git and GitHub 0:00:48

Git and GitHub #codinginterview #shortsvideo

Git and GitHub 2:21:43

Git and GitHub Tutorial For Beginners | Full Course [2021] [NEW]

Git, GitHub, & 0:22:16

Git, GitHub, & GitHub Desktop for beginners

Curso de GIT 5:05:22

Curso de GIT y GITHUB desde CERO para PRINCIPIANTES

Learn Git In 0:15:59

Learn Git In 15 Minutes

Complete Git and 1:12:40

Complete Git and GitHub Tutorial

Git & GitHub 5:08:41

Git & GitHub Full Course in 5 Hours | Git GitHub Tutorial for Beginners | DevOps Training | Edur...

Git For Beginners 2:00:37

Git For Beginners 2023

How Git Works: 0:04:18

How Git Works: Explained in 4 Minutes

Git for Professionals 0:40:42

Git for Professionals Tutorial - Tools & Concepts for Mastering Version Control with Git

Git And GitHub 0:33:06

Git And GitHub in ~30 Minutes

Git & GitHub 2:00:39

Git & GitHub Crash Course 2023

Git Tutorial for 0:36:21

Git Tutorial for Absolute Beginners

Git & GitHub 0:32:42

Git & GitHub Crash Course For Beginners

Git vs. GitHub: 0:10:06

Git vs. GitHub: What's the difference?

Git and GitHub 11:12:59

Git and GitHub Tutorial for Beginners [11 Hours]

Комментарии
Автор

Thanks man. All my fears about starting with git have disappeared. Ready for the github videos now! Cheers!

hpottstock
Автор

"Yeah! I'm terribly original!" You rock....And these tutorials are just awesome....

arijitgayen
Автор

"... now I want you to imagine that some upstart new at the company has decided to just make edits on the master branch. Yep, those people do exist." This is where I cracked. XD

hyfytale
Автор

Thank you very much for the clear explanation! Even 5 years after this tutorial is still relevant <3

mangekyourinnegan
Автор

When I started with GIT, I was one of those people who were updating directly master :D until everyone was complaining :D

peterinvestor
Автор

@The Net Ninja: I just found this tutorial when I was trying to understand a good workflow and common use case for branches and merging. And I must say you are one of my favorite YouTube instructors in the way you explain everything step-by-step! Keep up the good work!!

erichepperlewp
Автор

"Yep i'm terribly original" that's why you're easy to follow !! Love you Sensei from Sénégal

mysterOrel
Автор

when the person who made the tutorial has a accent like this you know the tutorial will be good

nicolevitalli
Автор

"and we don't do it in the text editor we do all in the terminal" 😅 just for have fun.
you have the best explanation, thank you for this tutorial

mahamadounouridinemamoudou
Автор

I was so confused about how to resolve conflicts in files, VS Code also makes it a little more intimidating with different functions, messages and whatnot, but this helped me to understand what it actually all does, how it happens and how to resolve them. Thank you!

nttx
Автор

I had to do my first merge into production code and I watched this video to make sure I don't f* it up! Thanks man, I love your videos.

DTX_
Автор

Gold. Pure gold! I was so scary to touch that area of git! And now everything clear! Thank you, Ninja!

Hacking-NASSA-with-HTML
Автор

you did a great job at simplifyng this issue with those branch names and examples

voychoi
Автор

"And we don't do it in the text editor, we do it over here"

always gets me! Lol
Thanks for this bro!

jayrocks
Автор

we love you Shaun. I am very appreciative of what you do for us! keep up the fantastic work.

theartist
Автор

Don't understand why that dislike on the video... Best explanation ever, very detailed. :)

leonelnascimento
Автор

currently a Master branch updater. Cant wait to master Branches and Merging. Thanks mate!

EricAbroad
Автор

By far the best tutorial on Git. Thanks a lot man!

janekalam
Автор

Two thumbs way up for this! Thanks for clearing up a lot of confusing tutorials.

AnthonyWatsonMWArts
Автор

By far, the best explanation on this. 3rd video I had to watch since the literature Im going over was blurry on my head. Subscribing now.

nexusfriends