[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: Andreas Schwab
Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2]
Date: Sun, 03 Apr 2016 23:15:34 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux)

Paul Eggert <address@hidden> writes:

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

If you get a merge conflict then you also get rebase conflicts.

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

Merging is much easier to handle.


Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

reply via email to

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