Git rebase: how to resolve conflicts

Conflicts resolution process during git rebase is somewhat confusing to a lot of developers I've worked with. In this video I try to explain it as simply as possible and then show the simple way to do it.

Buy me a coffee: https://www.buymeacoffee.com/teamprog...

Contents:

0:00 Short sketch - thank you Bryan and Danny!
0:26 Git rebase recap, short explanation
1:36 Demo of git rebase with conflicts

Next up: squashing commits with git rebase.

Follow me online:
LinkedIn:   / alex-kovshovik  
Twitter:   / ashovik  
Personal YouTube:    / @alexkovshovik  
Instagram:   / alex.kovshovik  
Facebook:   / ashovik  
Mastodon: https://mastodon.social/@alex_kovshovik