threads / discuss / 43718

Re: warning merge message

Subject: Re: warning merge message

## tl;dr

One message between Dec 20, 2006 and Dec 20, 2006.

replies: 0people: 1as markdown or json

Luben Tuikov· Dec 20, 2006, 21:34 UTC · lore

Furthermore, isn't the local origin fast forwarded to the remote master, and then the local origin merged into the local master and then the master checked out (presumably the user hasn't edited contents of their master branch).

This "warning" message is confusing and the branch.<branch>.merge config option poorly documented.

Can someone clarify these things to me please?

Thanks,
    Luben

$ 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.