In a team of developers you may find rebasing when you pull changes to be more sensible than merging. This video explains the practical differences between merge pulling and rebase pulling in git so you can decide for yourself.