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

Re: [TOPGIT] Resolving conflicts

From
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date
Dec 1, 2008, 14:36 UTC
Message-ID
<20081201143640.GA17818@cassiopeia.tralala>
In-Reply-To
<20081201121819.GB13495@pengutronix.de>
[added martin f krafft to Cc:]
Hi,
> Another thing is that the exported branch contains an empty commit
> resulting from t/whatever (and a corresponding empty patch when exported
> as a quilt series)
I fixed one half of this in with a patch sent to the ML:
	http://article.gmane.org/gmane.comp.version-control.git/101728
it didn't made it upstream yet, though.

Best regards Uwe

Previous: Sascha HauerNext: martin f krafft
Message 2 of 3 in “[TOPGIT] Resolving conflicts”
  1. Sascha HauerDec 1, 2008
  2. Uwe Kleine-KönigDec 1, 2008
  3. martin f krafftDec 2, 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.