From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Eikum <aeikum@codeweavers.com>
Subject: Re: Copy branch into master
Date: Mon, 28 Nov 2011 13:26:59 -0600
Message-ID: <20111128192659.GD29503@foghorn.codeweavers.com>
References: <CAHxBh_T-f7O4r0zn=NtLTYtdbNqd3qSo2tW84aYRJp7ugDSMpw@mail.gmail.com>
 <20111128183616.GB29503@foghorn.codeweavers.com>
 <3655DADD9B52450B81B0CD34F1B0FAB6@bny.us.bosch.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Cc: git@vger.kernel.org
To: Ron Eggler <ron.eggler@gmail.com>
X-From: git-owner@vger.kernel.org Mon Nov 28 20:27:12 2011
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@lo.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <git-owner@vger.kernel.org>)
	id 1RV6r6-0001OV-0D
	for gcvg-git-2@lo.gmane.org; Mon, 28 Nov 2011 20:27:08 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754126Ab1K1T1D (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Mon, 28 Nov 2011 14:27:03 -0500
Received: from mail.codeweavers.com ([216.251.189.131]:46945 "EHLO
	mail.codeweavers.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753689Ab1K1T1B (ORCPT <rfc822;git@vger.kernel.org>);
	Mon, 28 Nov 2011 14:27:01 -0500
Received: from foghorn.codeweavers.com ([216.251.189.130])
	by mail.codeweavers.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)
	(Exim 4.72)
	(envelope-from <aeikum@codeweavers.com>)
	id 1RV6qy-0004Xn-Hq; Mon, 28 Nov 2011 13:27:00 -0600
Content-Disposition: inline
In-Reply-To: <3655DADD9B52450B81B0CD34F1B0FAB6@bny.us.bosch.com>
User-Agent: Mutt/1.5.20 (2009-06-14)
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/186029>

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