did you try merging by creating a pull request in bitbucket?

Right but you can create your branches on bitbucket. Then check them out locally, push locally. Then head back to BB to do the merging into master as well.

have you tried something like bitbucket? I have found it really simplifies the process for me (especially with merging)