[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Resuming M-x gitmerge
From: |
Noam Postavsky |
Subject: |
Resuming M-x gitmerge |
Date: |
Sun, 10 Jun 2018 19:54:58 -0400 |
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?
- Resuming M-x gitmerge,
Noam Postavsky <=
- Re: Resuming M-x gitmerge, Eli Zaretskii, 2018/06/10
- Re: Resuming M-x gitmerge, João Távora, 2018/06/11
- Re: Resuming M-x gitmerge, Noam Postavsky, 2018/06/11
- Re: Resuming M-x gitmerge, Eli Zaretskii, 2018/06/11
- Re: Resuming M-x gitmerge, Stefan Monnier, 2018/06/11
- Re: Resuming M-x gitmerge, Eli Zaretskii, 2018/06/11
- Re: Resuming M-x gitmerge, Noam Postavsky, 2018/06/11
Re: Resuming M-x gitmerge, Glenn Morris, 2018/06/11