Hi, On Fri, 7 Mar 2008, Andy Parkins wrote: > I've been keeping up with development only intermittently lately, and > just got a warning from git fetch (in my git directory) that the update > to my 'next' tracking branch was rejected as not being a fast forward. Junio announced this (IIRC a couple of times), and you can also read in MaintNotes: > The two branches "master" and "maint" are never rewound, and "next" > usually will not be either (this automatically means the topics that > have been merged into "next" are usually not rebased, and you can find > the tip of topic branches you are interested in from the output of "git > log next"). You should be able to safely track them. > After a feature release is made from "master", however, "next" will be > rebuilt from the tip of "master" using the surviving topics. The commit > that replaces the tip of the "next" will have the identical tree, but it > will have different ancestry from the tip of "master". An announcement > will be made to warn people about such a rebasing. Hth, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
