Re: [PATCH 10/25] gettextize: git-merge basic messages

Ævar Arnfjörð Bjarmason wrote:

It's on top of pu,

[...]

But I was hoping that this would
make it into pu and after next gets released Any Day Now most of those
other tips in pu would be folded into next along with gettext, or at
least the merge conflicts wouldn't be too painful.

Hmm.  That really constrains people trying to merge this series.

As SubmittingPatches explains:

 - In the exceptional case that a new feature depends on several topics
   not in 'master', start working on 'next' or 'pu' privately and send
   out patches for discussion. Before the final merge, you may have to
   wait until some of the dependent topics graduate to 'master', and
   rebase your work.

so this is fine for discussion, but for merging, having to pull in
_all_ topics from pu (or all topics from next for that matter) for
the patches to apply really is a problem.

Both next and pu get rewound from time to time.  They are not meant
to be a stable basis for patches.

Also worth mentioning is that topics in "next" are not guaranteed to
be included in the next release.  The "next" branch has content
matching the "jch" branch which I think has a better name: it is
just the version of git that Junio uses for ordinary tasks (and
hence topics in it cannot be completely broken for long).