all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Resuming M-x gitmerge
@ 2018-06-10 23:54 Noam Postavsky
  2018-06-11  2:37 ` Eli Zaretskii
  2018-06-11 15:50 ` Glenn Morris
  0 siblings, 2 replies; 14+ messages in thread
From: Noam Postavsky @ 2018-06-10 23:54 UTC (permalink / raw)
  To: emacs-devel; +Cc: Glenn Morris

When M-x gitmerge hits a conflict, it shows a window with the message:

    Resolve the conflicts manually, then run gitmerge again.
    Note:
      - You don't have to add resolved files or commit the merge yourself (but you can).
      - You can safely close this Emacs session and do this in a new one.
      - When running gitmerge again, remember that you must do that from within the Emacs repo.

The first note is either wrong, or I'm misunderstanding it.  If I don't
'git add' the resolved files and commit the merge, then trying to run
M-x gitmerge again fails with (user-error "Repository is not clean").

So what is the intended workflow here?




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

end of thread, other threads:[~2018-06-19  0:27 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-10 23:54 Resuming M-x gitmerge Noam Postavsky
2018-06-11  2:37 ` Eli Zaretskii
2018-06-11  6:54   ` João Távora
2018-06-11 12:40     ` Noam Postavsky
2018-06-11 15:30       ` Eli Zaretskii
2018-06-11 15:46         ` Stefan Monnier
2018-06-11 16:00           ` Eli Zaretskii
2018-06-11 16:14             ` Noam Postavsky
2018-06-11 15:50 ` Glenn Morris
2018-06-11 16:12   ` Noam Postavsky
2018-06-11 18:18     ` Glenn Morris
2018-06-11 19:31     ` David Engster
2018-06-12  0:48       ` Noam Postavsky
2018-06-19  0:27         ` Noam Postavsky

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.