git rebase - Why, When & How to fix conflicts

Опубликовано: 10 Июнь 2024
на канале: Philomatics

54,511

3.2k

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!
https://philomatics.com/git-workshop/

Fixing merge conflicts:
   • Never fear merge conflicts again - gi...

Video on `git pull --rebase`:
   • Never* use git pull

How to change your default editor in git:
   • My most used git aliases

Use the following command to change your default editor to VSCode:

git config --global core.editor "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:
https://marketplace.visualstudio.com/...

If you don't use VSCode, you can also use SourceTree, which is free.
https://www.sourcetreeapp.com/

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 F.Supp.3d 34 (S.D.N.Y. 2017); Equals Three, LLC v. Jukin Media, Inc., 139 F. Supp. 3d 1094 (C.D. Cal. 2015).