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

Re: Bad merging with stgit or git

From
JFJ. Bruce Fields <bfields@fieldses.org>
Date
Mar 21, 2006, 19:39 UTC
Message-ID
<20060321193924.GD14579@fieldses.org>
In-Reply-To
<1142969653.4749.109.camel@praia>
On Tue, Mar 21, 2006 at 04:34:13PM -0300, Mauro Carvalho Chehab wrote:
> It shouldn't have any conflicts here for Linus, since those patches came
> from his tree.

What do you mean by "those patches came from his tree"? If you're actually cherry-picking patches from his tree and applying them to yours, then you're not reproducing the same commits he has--you're just creating new commits that happen to have nearly identical content.

--b.
Previous: Mauro Carvalho ChehabNext: Mauro Carvalho Chehab
Message 2 of 8 in “Bad merging with stgit or git”
  1. Mauro Carvalho ChehabMar 21, 2006
  2. J. Bruce FieldsMar 21, 2006
  3. Mauro Carvalho ChehabMar 21, 2006
  4. Junio C HamanoMar 21, 2006
  5. Linus TorvaldsMar 21, 2006
  6. Petr BaudisMar 21, 2006
  7. Linus TorvaldsMar 21, 2006
  8. Junio C HamanoMar 21, 2006

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.