RFR: 1463: Include starting branch in back port instructions [v3]

Erik Joelsson erikj at openjdk.org
Mon Aug 8 17:18:18 UTC 2022

On Sat, 6 Aug 2022 10:39:44 GMT, Guoxiong Li <gli at openjdk.org> wrote:

>> Hi all,
>> This patch adds the suggested git command about fetching the newest code 
>> from the target branch before solving the conflicts.
>> Thanks for taking the time to review.
>> Best Regards,
>> -- Guoxiong
> Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:
>   Tweak the message again.

There are two issues being addressed in this change.

1. The implicit assumption that you need to be checked out on the target branch in your personal fork before starting to run the suggested commands. 
2. Your local repo needs to be reasonably up to date on that target branch.

I definitely think that 1 needs to be included first in the current list of commands, as otherwise you risk doing some pretty weird things. As for 2, this can be achieved in a number of different ways, of which various incarnations of `git sync` are probably common, but the basic way of achieving it is through `git fetch`. My suggestion would be to simply state the recommendation that you should be up to date with the target branch of your upstream and give a separate suggested command to achieve that. The fetch command in the current version of the patch works for me.


PR: https://git.openjdk.org/skara/pull/1344

More information about the skara-dev mailing list