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

Re: Copy branch into master

From
AEAndrew Eikum <aeikum@codeweavers.com>
Date
Nov 28, 2011, 19:26 UTC
Message-ID
<20111128192659.GD29503@foghorn.codeweavers.com>
In-Reply-To
<3655DADD9B52450B81B0CD34F1B0FAB6@bny.us.bosch.com>
On Mon, Nov 28, 2011 at 11:08:33AM -0800, Ron Eggler wrote:
Show 9 quoted lines
> I guess I'd go for renaming DVT to master.
> 
> However, I also played around with merge a little, started a merge (in
> Windows GUI) and aborted it but the icon of my directory keeps showing the
> ywellow exclemation mark, signing that a merge is going on right now but
> going into the directory, all the files are with a geen check mark. What's
> going on here? How do I resolve this - I don't wanna mess things up so I
> might rather resolve this before moving DVT to master.
>

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?

Andrew
Previous: Ron EgglerNext: Ron Eggler
Message 4 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.