Re: bignum branch

[Eli Zaretskii]

> From: Michael Albinus <address@hidden>
> Cc: Tom Tromey <address@hidden>,  address@hidden,  address@hidden
> Date: Thu, 09 Aug 2018 09:59:56 +0200
> 
> Eli Zaretskii <address@hidden> writes:
> 
> >> Still wondering about git merge -vs- git rebase for this branch.
> >
> > If you are wondering because you are not sure what are our policy,
> > then you should know we don't have one.  Some people merge, others
> > rebase, still others do a mix.  So it's up to you, I think.
> 
> emacswiki recommends "git merge", see
> <https://www.emacswiki.org/emacs/GitForEmacsDevs#toc13>.

That's a recommendation, not a mandatory policy.  People have been
doing things differently right and left.

> Maybe we shall add a similar section (Working in a Task Branch) to
> admin/notes/git-workflow, be it "git merge" or "git rebase" based. Or
> simply link to emacswiki.

We already say that in CONTRIBUTE.  (I don't really understand why
git-workflow exists, but at the time people objected to delete it.)