Merging strategies

Depending on the source control system you are working with, there might be multiple ways you can merge your changes from one branch to another.