[Top][All Lists]

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

Use of git branches (was: [Emacs-diffs] master 2b316c0: ; * CONTRIBUTE:

From: Nicolas Richard
Subject: Use of git branches (was: [Emacs-diffs] master 2b316c0: ; * CONTRIBUTE: Add section about the bug tracker)
Date: Fri, 06 Nov 2015 11:16:17 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux)

Juanma Barranquero <address@hidden> writes:
> On Fri, Nov 6, 2015 at 10:49 AM, Eli Zaretskii <address@hidden> wrote:
>> The convention was to use scratch/ for experimental branches and fix/
>> for public feature branches that fix some issue. Suggestions to
>> codify this are welcome.
> Was this convention discussed on emacs-devel?

ISTR there was some kind of decision that scratch/ branches didn't have
to follow the gitlog-is-ChangeLog convention, i.e. they would never be
merged as is, but always rebased or squashed onto master.


reply via email to

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