[Top][All Lists]

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

Re: Understanding a recent commit in emacs-25 branch [ed19f2]

From: Paul Eggert
Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2]
Date: Sun, 3 Apr 2016 13:02:39 -0700
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0

Andreas Schwab wrote:
Rebase should never be the default, because it is more complicated and
harder to get right.  It creates new commits that each must be retested.

Rebasing makes sense for Alan's use case. He was working on the fix anyway, so retesting was not that big a deal for him. Conversely, he's more of an Emacs expert than a Git expert and merge conflicts are more of an hassle for him. This particular case did not benefit much from the advantages of merging over rebasing; quite the contrary.

As one becomes more of a Git expert, merging becomes more attractive. It does take some getting used to, though.

reply via email to

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