[Top][All Lists]

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

Re: bignum branch

From: Paul Eggert
Subject: Re: bignum branch
Date: Thu, 9 Aug 2018 10:31:41 -0700
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1

Eli Zaretskii wrote:
emacswiki recommends "git merge", see
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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]