Git Rebase: how to resolve conflicts Apr 24, 2021 Hi All! This is a short humorous video about the git rebase: a practical example of how to resolve conflicts during the automatic rebase: Please watch: