SHARE

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:
+ Atom editor – https://atom.io/a
+ CMDER – http://cmder.net/
+ GIT – https://git-scm.com/

———————————————————————————————
Related tutorials:

—– NODE.JS TUTORIALS
https://www.youtube.com/playlist?list=PL4cUxeGkcC9gcy9lrvMJ75z9maRw4byYp

—– SUBSCRIBE TO CHANNEL – https://www.youtube.com/channel/UCW5YeuERMmlnqo4oq8vwUpg?sub_confirmation=1

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

For more front-end development tutorials & to black-belt your coding skills, head over to – https://www.youtube.com/channel/UCW5YeuERMmlnqo4oq8vwUpg or http://thenetninja.co.uk

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

Twitter – @TheNetNinja – https://twitter.com/thenetninjauk

7 COMMENTS

  1. Love your videos but got one question.

    I was taught to do, while on a branch, commit changes, "git push -u origin nameofbranch" (while in the branch) and then go to the master, merge nameofbranch and finally "git push origin master".

    You seem to be on a branch, make the changes, commit, go to master, merge and push.

    What is the difference?

  2. When I use "git merge branch-whatever" the conflicts don't show up in the editor. When I was practicing this morning they did, but not anymore. However, the plus and minus sign regarding code lines does show in the terminal. Any idea what's going on? I am using vscode

LEAVE A REPLY

Please enter your comment!
Please enter your name here