[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-messag
From: |
Eli Zaretskii |
Subject: |
Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message, |
Date: |
Mon, 06 Apr 2015 15:24:44 +0300 |
> Date: Mon, 06 Apr 2015 15:03:23 +0300
> From: Dmitry Gutov <address@hidden>
> CC: address@hidden, address@hidden
>
> On 04/06/2015 10:54 AM, Eli Zaretskii wrote:
>
> > Then please tell what you had in mind, perhaps it would be good to
> > have that added.
>
> I use 'git rebase -i' for that. Not sure if we actually want to mention
> rebasing in the instructions.
That's exactly the issue: should we mention such techniques on that
page?
> But if not, should they recommend reviewing each commit right away after
> it's made?
Probably a good idea, thanks.
> So what was needed is a pull, a merge resolving the conflicts, and then
> a push. The situation was complicated by the need to resolve ChangeLog
> conflicts manually (or else there may have been no conflicts at all),
> which is something that was a problem for me as well after Emacs's
> transition to Git. While I know how to merge, it wasn't obvious how
> exactly those kind of conflicts should be resolved, which ordering to
> use, dates, etc. And it's annoying to have to do it each time manually.
I hope the instructions in their current form explain all that well
enough.
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Dmitry Gutov, 2015/04/05
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Eli Zaretskii, 2015/04/05
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Dmitry Gutov, 2015/04/05
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Eli Zaretskii, 2015/04/05
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Dmitry Gutov, 2015/04/05
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Eli Zaretskii, 2015/04/05
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Dmitry Gutov, 2015/04/05
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Eli Zaretskii, 2015/04/06
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Dmitry Gutov, 2015/04/06
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,,
Eli Zaretskii <=
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Dmitry Gutov, 2015/04/06
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Eli Zaretskii, 2015/04/07
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Richard Stallman, 2015/04/07
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Eli Zaretskii, 2015/04/07
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Alan Mackenzie, 2015/04/07
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Eli Zaretskii, 2015/04/07
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Alan Mackenzie, 2015/04/07
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Eli Zaretskii, 2015/04/08
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Dmitry Gutov, 2015/04/07
- Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,, Alan Mackenzie, 2015/04/08