Re: bignum branch

[Paul Eggert]

Eli Zaretskii wrote:
> > 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.

For what it's worth, I almost always rebase rather than merge, as this makes it 
easier for later maintainers to understand the changes.

There's a tension here between maintaining metadata (that is, info about who 
made a change and when and in what context), versus maintaining data (that is, 
the software itself). Merging prioritizes metadata, whereas rebasing prioritizes 
data. When I'm spelunking through development history I'm almost always more 
interested in data, so I prefer changes to be rebased.