Watch this video on YouTube
Clear example showing how to rebase a feature branch onto master with commands conflict handling and safe push tips