Git Crash Course - Common Problems, Merge Conflicts (part 3/3)
This is part of my Git Version Control for Beginners course. Perfect for anyone just starting out with Git or looking to refresh their knowledge.
You can find resources and other information for this video at the Full Stack Foundations link below:
Video Link: https://www.fullstackfoundations.com/...
Course Home: https://www.fullstackfoundations.com/...
-------------------------------------------------------------------------------------
Connect with me:
Twitter: https://www.x.com/zg_dev
Full Stack Foundations: https://www.fullstackfoundations.com
-------------------------------------------------------------------------------------
Timestamps:
0:00 Intro
2:23 Remote and Local Repository Conflicts
5:42 Fixing conflicts with git stash command
8:44 Local merge conflicts
12:30 Fixing merge conflicts with Visual Studio Code Editor
15:20 Git Checkout, Git Revert, Git Reset Intro and the Three Trees of Git
21:46 Git Checkout Command
25:24 The "detached HEAD state"
26:06 Git Checkout visual
26:26 Git Revert Command
27:59 Git Revert Visual
32:57 Reverting back to merge commit (the "unmerged paths" error)
42:04 Git Reset Command
43:13 Git Reset Visual
52:56 Common use of the Git Reset command
55:45 Forcing Git push upstream
