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
