Improve the backport script.

It now uses the origin/master branch rather than the master branch, thus
avoiding the need for local merges.

More importantly, it no longer creates a subshell in case of conflicts,
but instead gives control back to the user. Once conflicts are solved, it
suffices to relaunch the script (instead of exiting the subshell). The
reason is that, otherwise, there was no sane way of giving up a backport,
due to the infinite subshell loop.

0 files changed, 0 insertions, 0 deletions