Skip to content

Commit b9b995e

Browse files
committed
Merge branch 'jc/doc-discarding-stalled-topics'
Document that inactive topics are subject to be discarded. * jc/doc-discarding-stalled-topics: howto-maintain-git: discarding inactive topics
2 parents 441e0df + 9c4c840 commit b9b995e

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

Documentation/howto/maintain-git.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,22 @@ the mailing list after each feature release is made:
6767
before getting merged to 'master'.
6868

6969
- 'seen' branch is used to publish other proposed changes that do
70-
not yet pass the criteria set for 'next' (see above).
70+
not yet pass the criteria set for 'next' (see above), but there
71+
is no promise that 'seen' will contain everything. A topic that
72+
had no reviewer reaction may not be picked up.
73+
74+
- A new topic will first get merged to 'seen', unless it is
75+
trivially correct and clearly urgent, in which case it may be
76+
directly merged to 'next' or even to 'master'.
77+
78+
- If a topic that was picked up to 'seen' becomes and stays
79+
inactive for 3 calendar weeks without having seen a clear
80+
consensus that it is good enough to be moved to 'next', the
81+
topic may be discarded from 'seen'. Interested parties are
82+
still free to revive the topic. For the purpose of this
83+
guideline, the definition of being "inactive" is that nobody
84+
has discussed the topic, no new iteration of the topic was
85+
posted, and no responses to the review comments were given.
7186

7287
- The tips of 'master' and 'maint' branches will not be rewound to
7388
allow people to build their own customization on top of them.

0 commit comments

Comments
 (0)