Re: bignum branch

[Michael Albinus]

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>.

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.

Best regards, Michael.