update branchsync to deal with merge commits

Evan Hunt requested to merge branchsync into master

The branchsync script needs updating to accommodate non-fast-forward merge commits.

Merge request reports