Releases: sorenlouv/backport
Releases · sorenlouv/backport
v1.4.0
6e4dfed
This commit was signed with the committer’s verified signature.
The key has expired.
sorenlouv
Søren Louv-Jansen
Better handling of merge conflicts
When a cherrypick resultet in a conflict, the user should manually fix it. Unfortunately the user was not made aware, that she should also commit her changes. This sometimes resulted in pull request that didn't have the changes for the conflict resolution.
With this patch the user cannot proceed to from the cherrypick step, if a conflict occurred, and has not been completely resolved. If the index is dirty (new or modified files), and the user still tries to continue, a new prompt will ask her to resolve and commit it.
v1.3.0
69af057
This commit was signed with the committer’s verified signature.
The key has expired.
sorenlouv
Søren Louv-Jansen
Backporting multiple commits
It's now possible to backport multiple commits. It can be enabled by running backport --multiple or adding multiple: true to the backport config.
Bug fixes
- It was previously possible to continue the program by pressing enter, without having selected any commits/versions. This is now fixed, so continuing is not possible before a selection has been made.