From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sylvain Rabot Subject: Re: Add new option in the right click menu in git gui Date: Mon, 01 Mar 2010 22:29:31 +0100 Message-ID: <1267478971.4400.5.camel@kheops> References: <7fce93be1002181511v1c671f82u7f3d7cc6e3512bab@mail.gmail.com> <20100301171222.GA35830@book.hvoigt.net> Reply-To: sylvain@abstraction.fr Mime-Version: 1.0 Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-nJPTkqdITn5ic8dwnCdz" Cc: git To: Heiko Voigt X-From: git-owner@vger.kernel.org Mon Mar 01 22:29:43 2010 Return-path: 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 ) id 1NmDBM-0005hB-Gr for gcvg-git-2@lo.gmane.org; Mon, 01 Mar 2010 22:29:40 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752412Ab0CAV3f (ORCPT ); Mon, 1 Mar 2010 16:29:35 -0500 Received: from mail-bw0-f212.google.com ([209.85.218.212]:35371 "EHLO mail-bw0-f212.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751263Ab0CAV3f (ORCPT ); Mon, 1 Mar 2010 16:29:35 -0500 Received: by bwz4 with SMTP id 4so2214477bwz.28 for ; Mon, 01 Mar 2010 13:29:33 -0800 (PST) Received: by 10.204.3.216 with SMTP id 24mr3587092bko.30.1267478973593; Mon, 01 Mar 2010 13:29:33 -0800 (PST) Received: from ?192.168.0.77? (smj33-1-82-233-66-33.fbx.proxad.net [82.233.66.33]) by mx.google.com with ESMTPS id 15sm2373346bwz.12.2010.03.01.13.29.32 (version=SSLv3 cipher=RC4-MD5); Mon, 01 Mar 2010 13:29:32 -0800 (PST) In-Reply-To: <20100301171222.GA35830@book.hvoigt.net> X-Mailer: Evolution 2.28.1 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: --=-nJPTkqdITn5ic8dwnCdz Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2010-03-01 at 18:12 +0100, Heiko Voigt wrote: > On Fri, Feb 19, 2010 at 12:11:57AM +0100, Sylvain Rabot wrote: > > Hi, > >=20 > > In case of conflicts it is possible in git gui, through the right > > click menu, to use local or remote versions, but, unless I missed > > something, it is not possible, after using the merge tool, to add > > merged files to the index. > >=20 > > It would be nice if we could add merged files in the index directly in = git gui. >=20 > I do not see anything missing. After resolving a conflict you usually > just need to add the files (in git gui click on the icon of the file). > Am I missing something? This is the usual conflict resolution workflow > for git, I see no need for an extra menu option. >=20 > cheers Heiko Haaaaaaa, I don't know how many times I tried to do a right click on the path itself but I never had the idea to click the icon :P Thanks. --=20 Sylvain Rabot --=-nJPTkqdITn5ic8dwnCdz Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkuMMboACgkQ+TklUoyVcyfnAQCfbRiBBsqxKgT6UtLGTaNXtEQQ ok8AnREPyeQjhCwUnSsskzImk2aESeIw =6dVY -----END PGP SIGNATURE----- --=-nJPTkqdITn5ic8dwnCdz--