all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?
@ 2015-05-26 22:39 Alan Mackenzie
  2015-05-26 22:43 ` Dmitry Gutov
                   ` (7 more replies)
  0 siblings, 8 replies; 42+ messages in thread
From: Alan Mackenzie @ 2015-05-26 22:39 UTC (permalink / raw)
  To: emacs-devel

Hello, Emacs

It's git misery time again.  :-(

I did a git stash, followed by git merge, followed by git stash pop.
This caused a conflict in .gitignore, which I repaired by editing
that file.

I think (but I'm not sure), I need somehow to tell git that the file has
been fixed.  The git equivalent of 'bzr resolve'.  I can't find any
documentation telling me how to do this, or alternatively that it's not
needed.

git status returns the following obscure "information":

    On branch master
    Your branch is up-to-date with 'origin/master'.
    Unmerged paths:
      (use "git reset HEAD <file>..." to unstage)
      (use "git add <file>..." to mark resolution)

            both modified:   .gitignore

.  I don't think I want to "unstage" anything (whatever that might
mean) - IIUC, the suggested recipe would discard all my changes.  I think
I might want to "mark resolution" (assuming this gobbledegook means
"mark <file> as resolved"), 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.

Do I actually need to tell git that the merge conflicts in .gitignore
have been fixed?  If so, how do I do this?  There doesn't appear to be a
'git resolve' command.

Where is this 'bzr resolve' equivalent documented?  I now have git
2.3.6, and it now comes with an info manual, and all its man pages
stuffed into another info document, which is a great improvement.  I
still can't find what I need, though.

Thanks in advance for the help.

-- 
Alan Mackenzie (Nuremberg, Germany).



^ permalink raw reply	[flat|nested] 42+ messages in thread

end of thread, other threads:[~2015-05-28  6:30 UTC | newest]

Thread overview: 42+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

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.