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

RE: Copy branch into master

From
RERon Eggler <ron.eggler@gmail.com>
Date
Nov 28, 2011, 19:30 UTC
Message-ID
<CB09450076EA444CA289CDCB995F16A4@bny.us.bosch.com>
In-Reply-To
<20111128192659.GD29503@foghorn.codeweavers.com>
> Sorry, I have no idea how to use any of the GUI tools. Perhaps your
> GUI tool has a mailing list where you can ask about merge conflict
> resolution?

No problem, I actually got it all figured out now, and got my branch smoothly merged back into master. Thanks for your help!

Ron
Previous: Andrew EikumNext: Neal Kreitzinger
Message 5 of 7 in “Copy branch into master”
  1. Ron EgglerNov 28, 2011
  2. Andrew EikumNov 28, 2011
  3. Ron EgglerNov 28, 2011
  4. Andrew EikumNov 28, 2011
  5. Ron EgglerNov 28, 2011
  6. Neal KreitzingerDec 1, 2011
  7. Tay Ray ChuanNov 29, 2011

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.