P4 Description
When using the /backport command and a conflict occurs which requires manual resolution the Skara bot helpfully adds a reply with suggested command lines for how to resolve things locally, along the lines of:
---
To manually resolve these conflicts run the following commands in your personal fork of $REPO:
$ git checkout -b $BACKPORT_BRANCH_NAME
$ git fetch --no-tags $URL $HASH
...
---
It is implied that one should start with a more-or-less up-to-date version of the target branch before executing the "git checkout" command. It would be helpful if that was included in the instructions. The bot could even include the exact branch name since it should be available explicitly or implicitly from the /backport command itself.
---
To manually resolve these conflicts run the following commands in your personal fork of $REPO:
$ git checkout -b $BACKPORT_BRANCH_NAME
$ git fetch --no-tags $URL $HASH
...
---
It is implied that one should start with a more-or-less up-to-date version of the target branch before executing the "git checkout" command. It would be helpful if that was included in the instructions. The bot could even include the exact branch name since it should be available explicitly or implicitly from the /backport command itself.
