|
From: | Stefan Monnier |
Subject: | Re: Missing changes in merges from emacs-25 to master |
Date: | Sat, 26 Mar 2016 17:34:03 -0400 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) |
> So I guess the fact that a commit was skipped during a merge is > something that is so hard to see that perhaps the entire issue of > skipping is moot with Git, and we shouldn't be bothered by it. Skipping is not something really relevant from the history point of view. It's rather relevant for the one performing a merge since the main purpose to avoid spurious conflicts. Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |