The conflict resolution process during Git rebase is a bit confusing for many developers I've worked with. In this video I'll try to explain it as simply as possible and then show the easy way to do it.

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

Contents:

0:00 Quick sketch – Thanks Bryan and Danny!
0:26 Git Rebase summary, short explanation
1:36 Demo of Git Rebase with conflicts

Next: Merge commits with Git Rebase.

Follow me online:
LinkedIn: https://www.linkedin.com/in/alex-kovshovik/
Twitter: https://twitter.com/ashovik
Personal YouTube: https://www.youtube.com/channel/UCNbOp6zn7A2pniaUbGbEf8Q
Instagram: https://www.instagram.com/alex.kovshovik/
Facebook: https://www.facebook.com/ashovik/
Mastodon: https://mastodon.social/@alex_kovshovik

Please take the opportunity to connect with your friends and family and share this video with them if you find it useful.