non-FF merge from master

All, I just had another "update (forced)" pull when I did "get fetch --all" on the master branch, followed by a failure to "git merge" onto my local master. As mentioned previously, my "master" branch is pristine, and should be unchanged from upstream "master". Is someone doing "rebase" on master? If so, can I cast a vote for "please don't"?