[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Missing changes in merges from emacs-25 to master
From: |
Eli Zaretskii |
Subject: |
Re: Missing changes in merges from emacs-25 to master |
Date: |
Tue, 22 Mar 2016 05:35:32 +0200 |
> From: John Wiegley <address@hidden>
> Cc: address@hidden, address@hidden, address@hidden
> Date: Mon, 21 Mar 2016 14:27:54 -0700
>
> As for "reason for the omission", I think there are two possible answers:
>
> 1. gitmerge.el auto-marked it to be skipped, and despite my examination of
> each such mark, I failed to see that should not be skipped.
>
> 2. I incorrectly resolved a merge conflict that seemed simple enough to me
> that I didn't e-mail the author of the commit about it.
But in these cases, the commit we lost should have been mentioned in
the list of skipped one. It wasn't, AFAICS.
- Re: Missing changes in merges from emacs-25 to master, (continued)
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, John Wiegley, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, John Wiegley, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master,
Eli Zaretskii <=
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Stefan Monnier, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Stefan Monnier, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Stefan Monnier, 2016/03/23
- Re: Missing changes in merges from emacs-25 to master, Stefan Monnier, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22