[Top][All Lists]

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

Re: [Emacs-diffs] scratch/follow e8937ed: Replace GROUP argument in six

From: John Wiegley
Subject: Re: [Emacs-diffs] scratch/follow e8937ed: Replace GROUP argument in six window primitives by new functions.
Date: Tue, 15 Dec 2015 07:22:32 -0800
User-agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin)

>>>>> Alan Mackenzie <address@hidden> writes:

> Any objections to me merging (or rebasing) this into the emacs-25 branch? I
> think it's ready.

If you receive no objections by week's end, please feel free to merge it in.

> By the way, is it normal to merge or to rebase in such circumstances. The
> code is currently in branch scratch/follow.

Personally I prefer merges for any branches that has been seen by others, as
it preserves the true history of the work. But if the policy has been to
rebase feature branches before merging them in, that works too.

John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

reply via email to

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