From: Dmitry Gutov <dgutov@yandex.ru>
To: Alan Mackenzie <acm@muc.de>, emacs-devel@gnu.org
Subject: Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?
Date: Wed, 27 May 2015 01:43:47 +0300 [thread overview]
Message-ID: <5564F723.7060309@yandex.ru> (raw)
In-Reply-To: <20150526223928.GA4675@acm.fritz.box>
Hi Alan,
On 05/27/2015 01:39 AM, Alan Mackenzie wrote:
> but the suggested recipe, as far as I am
> aware, doesn't "mark resolution", instead it moves a file into a list of
> files to be committed in the (?near) future.
It does both.
> Do I actually need to tell git that the merge conflicts in .gitignore
> have been fixed?
Need for what?
next prev parent reply other threads:[~2015-05-26 22:43 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-26 22:39 After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed? Alan Mackenzie
2015-05-26 22:43 ` Dmitry Gutov [this message]
2015-05-26 22:48 ` Kelvin White
2015-05-26 22:56 ` Alan Mackenzie
2015-05-26 23:05 ` Dmitry Gutov
2015-05-26 23:11 ` Kelvin White
2015-05-26 23:14 ` Kelvin White
[not found] ` <CAG-q9=aSF+6AcR1SHRgCTQLUrKXB5OEzPcbuV8M5+VEacxZc0g@mail.gmail.com>
2015-05-26 23:19 ` Kelvin White
2015-05-27 0:18 ` Tom Jakubowski
2015-05-27 2:38 ` Eli Zaretskii
2015-05-27 8:17 ` Andreas Schwab
2015-05-27 19:53 ` Steinar Bang
2015-05-28 5:27 ` Yuri Khan
2015-05-26 22:44 ` Kelvin White
2015-05-26 23:31 ` Artur Malabarba
2015-05-27 0:21 ` Kelvin White
2015-05-27 0:29 ` Dmitry Gutov
2015-05-27 0:36 ` Kelvin White
2015-05-27 0:38 ` Dmitry Gutov
2015-05-27 0:45 ` Kelvin White
2015-05-27 0:56 ` Dmitry Gutov
2015-05-27 1:55 ` Kelvin White
2015-05-27 1:57 ` Kelvin White
2015-05-27 2:02 ` Dmitry Gutov
2015-05-27 2:23 ` Kelvin White
2015-05-27 0:56 ` Kelvin White
2015-05-27 1:02 ` Dmitry Gutov
2015-05-27 1:40 ` Stefan Monnier
2015-05-27 1:52 ` Kelvin White
2015-05-27 2:40 ` Stefan Monnier
2015-05-27 2:55 ` Kelvin White
2015-05-27 3:14 ` Kelvin White
2015-05-27 3:16 ` Kelvin White
2015-05-27 10:12 ` Dmitry Gutov
2015-05-27 11:26 ` Kelvin White
2015-05-27 11:34 ` Dmitry Gutov
2015-05-27 12:36 ` Kelvin White
2015-05-27 12:48 ` Dmitry Gutov
2015-05-28 6:30 ` Steinar Bang
2015-05-27 2:37 ` Eli Zaretskii
2015-05-27 15:47 ` Alan Mackenzie
2015-05-27 19:46 ` Steinar Bang
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5564F723.7060309@yandex.ru \
--to=dgutov@yandex.ru \
--cc=acm@muc.de \
--cc=emacs-devel@gnu.org \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).