From: Heiko Voigt <hvoigt@hvoigt.net>
To: Sylvain Rabot <sylvain@abstraction.fr>
Cc: git <git@vger.kernel.org>
Subject: Re: Add new option in the right click menu in git gui
Date: Mon, 1 Mar 2010 18:12:29 +0100 [thread overview]
Message-ID: <20100301171222.GA35830@book.hvoigt.net> (raw)
In-Reply-To: <7fce93be1002181511v1c671f82u7f3d7cc6e3512bab@mail.gmail.com>
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
next prev parent reply other threads:[~2010-03-01 17:12 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 [this message]
2010-03-01 21:29 ` Sylvain Rabot
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=20100301171222.GA35830@book.hvoigt.net \
--to=hvoigt@hvoigt.net \
--cc=git@vger.kernel.org \
--cc=sylvain@abstraction.fr \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.