I have been using git for a while, but my merging has always been fairly simple. Create a branch, merge it to master. Sometime 2 people have branches out that touch the same cod
