From: Andrew Eikum <aeikum@codeweavers.com>
To: Ron Eggler <ron.eggler@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Copy branch into master
Date: Mon, 28 Nov 2011 13:26:59 -0600 [thread overview]
Message-ID: <20111128192659.GD29503@foghorn.codeweavers.com> (raw)
In-Reply-To: <3655DADD9B52450B81B0CD34F1B0FAB6@bny.us.bosch.com>
On Mon, Nov 28, 2011 at 11:08:33AM -0800, Ron Eggler wrote:
> 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
next prev parent reply other threads:[~2011-11-28 19:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-28 18:25 Copy branch into master Ron Eggler
2011-11-28 18:36 ` Andrew Eikum
2011-11-28 19:08 ` Ron Eggler
2011-11-28 19:26 ` Andrew Eikum [this message]
2011-11-28 19:30 ` Ron Eggler
2011-12-01 19:43 ` Neal Kreitzinger
2011-11-29 12:49 ` Tay Ray Chuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111128192659.GD29503@foghorn.codeweavers.com \
--to=aeikum@codeweavers.com \
--cc=git@vger.kernel.org \
--cc=ron.eggler@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).