Hi Francis, Thanks for your feedback.
It seems we should choose option 2. In addition, it seems less risky to run "git push --force" commands in the site branch. Best, Liya Fan Francis Chuang <[email protected]> 于2022年3月25日周五 12:14写道： > > Hi Liya, > > Thanks for bringing this up. We have always done the following when > committing: > 1. Always commit to master. > 2. If we need to publish the change to the site now (for example, new > committer or announcement), cherry-pick the change into the site branch > and publish it. > 3. After a release, make the site branch the same as master (git reset > --hard master) and force push (git push --force origin site). > > Francis > > On 25/03/2022 3:03 pm, Fan Liya wrote: > > Hi all, > > > > As part of the release process, we need to synchronize the master and > > site branches (Please see > > https://calcite.apache.org/docs/howto.html#making-a-release-candidate). > > Usually, the site is behind the master branch by some commits. > > If the existing commits in the site branch are in the same order as in > > the master branch, the task is easy: just switch to the site branch, > > and run > > > > git rebase master > > > > However, if some commits are in different orders, it can be tricky. > > For example, the master branch may have the following commits (in > > order): > > > > A, B, X1, X2, ... , Xn. > > > > and the site branch may have the following commits (in order): > > > > B, A, X1, X2. > > > > Basically we have two choices: > > > > 1. We can live with the out of order commits, because after > > cherry-picking commits X3, X4, ... , Xn to the site branch, the file > > contents will be consistent. > > > > The problem is that, since the two branches have diverged, we cannot > > use the rebase command. Instead, we have to manually cherry-pick > > commits individually, which requires large effort. In addition, for > > any subsequent release processes, we have to manually cherry-pick each > > commit. > > > > 2. We need to make the commits order consistent, which will make it > > easy for subsequent releases. > > However, the problem is that, to make the commits order consistent, > > some git force push command is unavoidable, which is risky to some > > extent. > > > > So what is the recommended way to do this? Thanks in advance for your > > feedback! > > > > Best, > > Liya Fan
