updates to Subsurface and libdivecomputer
torvalds at linux-foundation.org
Sun Sep 18 11:28:11 PDT 2016
On Sat, Sep 17, 2016 at 11:40 PM, Anton Lundin <glance at acc.umu.se> wrote:
> I also noted "Fix the gas mix parsing for the Aladin Tec 2G."
> (decfa24f92d148) in Jef's master that didn't make it into Linus merge.
> It merges cleanly so just pick it.
Ugh. So doing things this way will only make future merges harder,
because now the same lines have been changed in both branches.
Yes, right now the changes are identical. But if one branch now makes
further changes in the same area, it can become very messy, and things
like this can make merging much harder. Because then two branches will
have changed the same lines *differently*.
Oh well. What's done is done. And it's just one fairly small commit,
so not a big deal. But in general, this kind of cherry-picking should
be avoided like the plague exactly because it tends to cause problems
More information about the subsurface