|
| From: | Andreas Schwab |
| Subject: | Re: Missing changes in merges from emacs-25 to master |
| Date: | Fri, 25 Mar 2016 10:14:10 +0100 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux) |
Eli Zaretskii <address@hidden> writes: > There seems to be another issue with merging to master: we get back > commits that were cherry-picked from master to the release branch. What do you mean with "get back"? Since they are part of the history of the branch and merging incorporates the whole history you will of course see them from master. Andreas. -- Andreas Schwab, address@hidden GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
| [Prev in Thread] | Current Thread | [Next in Thread] |