osdir.com

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Rebasing master


Our policy has been to rebase master after releases. We can discuss how we
handle the release branch again if the community would like. In the
meantime contributors should git reset --hard apache/master

On Mon, Oct 8, 2018, 1:55 PM Antoine Pitrou <antoine@xxxxxxxxxx> wrote:

>
> Hi,
>
> Could we avoid rebasing the master branch?  I don't think it's very nice
> to force rewriting the histories of all development clones out there.
>
> "git pull" gave me a local merge commit, which I don't know what to do
> with...
>
> Regards
>
> Antoine.
>
>
>
> Le 08/10/2018 à 13:28, Kouhei Sutou a écrit :
> > Thanks!
> >
> > I've done the rebase. I'll add this task to the our Wiki.
> >
> > In <CAJPUwMCdJ29VNzMxAf6upipwKmqpRMESrABib3suOU7PgX1JhA@xxxxxxxxxxxxxx>
> >   "Re: [RESULT][VOTE] Release Apache Arrow 0.11.0 (RC1)" on Mon, 8 Oct
> 2018 13:06:54 +0200,
> >   Wes McKinney <wesmckinn@xxxxxxxxx> wrote:
> >
> >> Yes, rebase the current master branch (after pulling latest) on the
> release
> >> branch and force push. Thanks Kou!
> >>
> >> On Mon, Oct 8, 2018, 1:05 PM Kouhei Sutou <kou@xxxxxxxxxxxxxx> wrote:
> >>
> >>> Hi Wes,
> >>>
> >>> I have one question that isn't documented at "Post-release
> >>> tasks".
> >>>
> >>>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-Post-releasetasks
> >>>
> >>> Should I rebase master on "release-0_1_0_rc0"
> >>> ("release-0_11_0_rc1" for this case) local branch?
> >>>
> >>>   % git fetch --all --prune
> >>>   % git checkout master
> >>>   % git rebase apache/master
> >>>   % git rebase release-0_11_0_rc1
> >>>   % git push --force apache master
> >>>
> >>>
> >>> Thanks,
> >>> --
> >>> kou
> >>>
> >>> In <20181008.194105.485100005664531298.kou@xxxxxxxxxxxxxx>
> >>>   "[RESULT][VOTE] Release Apache Arrow 0.11.0 (RC1)" on Mon, 08 Oct
> 2018
> >>> 19:41:05 +0900 (JST),
> >>>   Kouhei Sutou <kou@xxxxxxxxxxxxxx> wrote:
> >>>
> >>>> With 3 binding +1 votes, 1 non-binding +1 and no other
> >>>> votes, the vote passes. Thanks all!
> >>>>
> >>>> I'll start "Post-release tasks".
> >>>>
> >>>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-Post-releasetasks
> >>>>
> >>>> Wes will write a blog post.
> >>>>
> >>>> Krisztián will create the conda-forge PRs.
> >>>>
> >>>> Any other helps are also welcome!
> >>>>
> >>>>
> >>>> Thanks,
> >>>> --
> >>>> kou
> >>>
>