Ask an Expert: How to use Github, (Conflicts & SSH)

🎓 View our courses: https://scrimba.com/links/all-courses In this stream, pro developer Michael dives deeper into how to use Github, including dealing with conflicts and connecting with SSH. 🖥 Contents 🖥 0:00 - Introduction 3:02 - What are we going to learn today? 10:24 - How can you do this with prompt? 10:42 - Are we going to discuss the difference between SSH and HTTP? 13:38 - So basically a conflict occurs when the changes happen inside the same file? 22:38 - If there is a conflict, do you merge it into a secondary branch and resolve the conflicts, then merge the resolved conflicts into the main again? 29:00 - Could you show the command to set up VS Code as default? 30:21 - What is the difference between GitHub Desktop and GitHub command lines? 35:09 - What is the difference between Git Bash and command line? When do you use each? 36:08 - Is there a Git Cheatsheet? 54:21 - Some people have received an email about using a password to access a repository and that this will not work soon, what is the solution? 55:33 - What is the difference between SSH Key and the personal access token? 56:03 - Do you have to clone specifically with SSH for this to work? 💻Check out Scrimba’s interactive learning platform: Scrimba: https://scrimba.com/ 🐦Say hi on Twitter: Scrimba: https://twitter.com/scrimba Leanne: https://twitter.com/RybaLeanne Michael: https://twitter.com/alanmynah