3 Commits

Author SHA1 Message Date
Misko Hevery 5dd2df6a58 build: force fetch PR in merge script (#21295)
Use `-f` when doing `git fetch` for the PR. Without 
it the `git fetch` will not overwrite what is currently 
fetched locally, in essence doing fast-forward only.
PR Close #21295
2018-01-05 15:02:04 -05:00
Miško Hevery 941cd102b8 build: force upstream fetch before merge (#21192)
PR Close #21192
2018-01-02 12:48:55 -08:00
Miško Hevery d1764fc3dd build: Add GitHub scripts for rebasing PRs (#18359)
PR Close #18359
2017-08-28 18:44:39 -05:00