19b3ad9da5
NO-JIRA fixing merge script on 1.x
2017-02-24 16:05:55 -05:00
3758f2a0c2
NO-JIRA: script to merge 1.x
2016-12-09 14:51:31 -05:00
f19a030cc4
Adding set -e on merge script
...
I had some cases where I had pending changes on my local copy and the script silent failed.
This will make sure people using this script would notice any failure during a merge
2016-07-28 17:41:08 -04:00
1d2d7d05e5
Allow override remote name in mergePR script
2016-04-08 10:03:19 -04:00
f4481cbdb6
Improving the merging process doc, based on rebasing
2016-02-02 08:56:47 -06:00
230aba76a2
adding merge-PR script to help merging Pull Requests
2015-09-25 14:29:09 -04:00
Clebert Suconic
Martyn Taylor