|
| From: | John Wiegley |
| Subject: | Re: Missing changes in merges from emacs-25 to master |
| Date: | Tue, 22 Mar 2016 12:21:10 -0700 |
| User-agent: | Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.0.92 (darwin) |
>>>>> Eli Zaretskii <address@hidden> writes: > It's not your fault. Quite a few others (myself included) produce these > merge-commits from time to time, this cannot be avoided. The problem is in > the merge procedure from emacs-25 to master -- it shouldn't skip such > merge-commits. One take away from this is to be very cautious in assessing whether merge commits should really be skipped or not. What is the criteria for knowing when they *should* be skipped? Checking to ensure that all those commits are already on master? -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
| [Prev in Thread] | Current Thread | [Next in Thread] |