On Thu, 25 May 2023 07:35:39 GMT, David Holmes <dhol...@openjdk.org> wrote:
>> @AlanBateman Sounds good, thanks for confirming. I've updated both the >> ProblemLists, but it needed yet another rebase, so yet another forced push. > >> it needed yet another rebase, so yet another forced push. > > You don't need to rebase (and force-push) you just merge with the master > branch and skara will take care of flattening the commits. @dholmes-ora It takes time to unlearn decades of "avoid merge commits" :) Thanks for the tip! ------------- PR Comment: https://git.openjdk.org/jdk/pull/14082#issuecomment-1562884014
