Why, when and how to do git rebase. How to fix merge conflicts during git rebase. If you like my style of teaching, I'd love to see you at a workshop! Fixing merge conflicts: Video on `git pull --rebase`: How to change your default editor in git: Use the following command to change your default editor to VSCode: git config --global "code --wait" If you use a different editor, just Google "git set text editor to $yourEditor", it's usually easy to find. Git Graph Extension for VSCode: If you don't use VSCode, you can also use SourceTree, which is free. 0:00 - Why rebase? 1:54 - Squash vs Rebase 2:11 - How to rebase 3:22 - Downsides of rebasing 4:37 - Fixing conflicts 5:28 - Conflict resolution example 8:15 - Interactive rebase Thank you to Jonas Geiler and Bruno Paulino for giving great feedback on drafts of this video! LEGAL DISCLAIMER ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ Everything here is for informational purposes only. All non-licensed clips used for fair use commentary, criticism, and educational purposes. See Hosseinzadeh v. Klein, 276 34 ( . 2017); Equals Three, LLC v. Jukin Media, Inc., 139 F. Supp. 3d 1094 (C.D. Cal. 2015).