Switch-less Git Branching

Merge or rebase? Why not both? In this video, Nicolas will show you how to work on parallel Git branches without having to switch between them thanks to Git's `--rebase-merges` feature.

Links:

* Nicolas' blog post about this topic: https://www.kdab.com/working-on-multiple-git-branches-without-switching/

* Documentation for --rebase-merges: https://git-scm.com/docs/git-rebase#_rebasing_merges

* Documentation for --update-refs: https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---update-refs

* Nicolas patch to --update-refs for better label names: https://github.com/git/git/pull/1784

All "Git Tips and Tricks" videos: https://www.youtube.com/playlist?list=PL6CJYn40gN6hXt0akH-7oKg5E2Y-tCh3t

Please note that non-English dubs for all KDAB videos are auto-generated. These translations have not been moderated by us and may contain inaccuracies. We appreciate your understanding and apologize for any confusion this may cause.