git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Something wrong with next in main git repository?

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Mar 7, 2008, 11:51 UTC
Message-ID
<alpine.LSU.1.00.0803071249400.19395@racer.site>
In-Reply-To
<200803071129.21551.andyparkins@gmail.com>
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:

Show 5 quoted lines
> 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.
Show 5 quoted lines
> 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

Previous: Jonathan del StrotherNext: Andy Parkins
Message 3 of 4 in “Something wrong with next in main git repository?”
  1. Andy ParkinsMar 7, 2008
  2. Jonathan del StrotherMar 7, 2008
  3. Johannes SchindelinMar 7, 2008
  4. Andy ParkinsMar 7, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.