+1
Thanks~ Haisheng Yuan------------------------------------------------------------------ 发件人：Francis Chuang<[email protected]> 日 期：2019年03月28日 06:49:44 收件人：<[email protected]> 主 题：Re: Site branch +1 I think this should reduce the number of "commits ahead" in the site branch compared to master to 0. On 28/03/2019 9:46 am, Julian Hyde wrote: > The site branch currently has a merge commit in it. But traditionally after a > release the site branch points to the same commit as the master branch. > > So, any objections if I reset the site branch, as follows: > > $ git checkout site > $ git reset —hard origin/branch-1.19 > $ git push -f origin site > > Then cherry-pick a couple of commits from master that need to go into the > site. > > To my eyes at least, that creates a simpler & clearer history. > > Julian > >
