Re: Problems with branches

From: Jeff King <peff@peff.net>
Date: Jan 27, 2007, 13:13 UTC
Message-ID: <20070127131355.GA2417@coredump.intra.peff.net>
In-Reply-To: <7vfy9xtjxs.fsf@assigned-by-dhcp.cox.net>

On Fri, Jan 26, 2007 at 04:03:27PM -0800, Junio C Hamano wrote:

Show 6 quoted lines

> Probably you are using v1.4.4.X.
> 
> The change to make git-merge accessible as the first level UI
> happened during the preparation for the upcoming v1.5.0, and is
> available only in v1.5.0-rc0 and newer versions (the latest is
> at v1.5.0-rc2).

This highlights a problem with the current web pages. The documentation
at http://www.kernel.org/pub/software/scm/git/docs/ is for the current
master (which is presumably where this user got the tutorial mentioning
'git merge' as porcelain). But I suspect a lot of people will be using
the latest released version (either from the tarball, or a binary
package). We could:
  1. Only re-publish the web doc at time of release
  2. Build the published web doc from 'maint' instead of master
  3. Publish (and clearly mark) both last-released and master doc
  4. Disregard it; this particular release made a lot of UI changes, but
     we're not likely run into this for most releases.

-Peff