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

Magnus Ihse Bursie ihse at openjdk.org
Mon Aug 8 10:38:31 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.

`skara sync` will sync your personal github fork with it's upstream. It will not fetch those changes to your local repo, which is needed to resolve the conflict locally.

Also, if you read the JBS issue, the problem is if you start out with a repo that is out of date. It is likely that things have worked out well for you (and as for most people, most of the time) due to sheer luck, or rather, the fact that your repo is likely already up to date. The request by Mikael was to add instructions that make sure that by following the instructions, you will succeed, always, and not just if you are lucky.


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

More information about the skara-dev mailing list