Quick practical guide to merging master into another branch with commands conflict handling and push best practices