bef1de Fix the merge_pull_request method

Authored and Committed by Pierre-Yves Chibon 9 years ago
    Fix the merge_pull_request method
    
    - Check and error if the desired branches are not in the repo or the fork
    - Fix the reference so that we always push to a head
    - Fix the merge commit to be on the desired branch, not hard-coded to master
    
        
file modified
+22 -6