git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sylvain Rabot <sylvain@abstraction.fr>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: git <git@vger.kernel.org>
Subject: Re: Add new option in the right click menu in git gui
Date: Mon, 01 Mar 2010 22:29:31 +0100	[thread overview]
Message-ID: <1267478971.4400.5.camel@kheops> (raw)
In-Reply-To: <20100301171222.GA35830@book.hvoigt.net>

[-- Attachment #1: Type: text/plain, Size: 962 bytes --]

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,
> > 
> > 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.
> > 
> > It would be nice if we could add merged files in the index directly in git gui.
> 
> 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.
> 
> 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.

-- 
Sylvain Rabot <sylvain@abstraction.fr>

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

  reply	other threads:[~2010-03-01 21:29 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-18 23:11 Add new option in the right click menu in git gui Sylvain Rabot
2010-03-01 17:12 ` Heiko Voigt
2010-03-01 21:29   ` Sylvain Rabot [this message]
2010-03-01 21:45     ` Bert Wesarg
2010-03-26 13:53       ` Heiko Voigt

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=1267478971.4400.5.camel@kheops \
    --to=sylvain@abstraction.fr \
    --cc=git@vger.kernel.org \
    --cc=hvoigt@hvoigt.net \
    /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).