On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller <jacob.e.kel...@intel.com> wrote: > From: Jacob Keller <jacob.kel...@gmail.com> > > notes-merge.c already re-uses the same functions for the automatic merge > strategies used by the rewrite functionality. Teach the -s/--strategy > option how to interpret the equivalent rewrite terminology for > consistency.
I'm somewhat negative to this patch. IMHO, adding the rewrite modes as merge strategy synonyms adds no benefit - only potential confusion - to the existing merge strategies. Words that have a sensible meaning in the context of rewrite, do not necessarily have the same sensible meaning in the context of merge (and vice versa). I'd rather have the rewrite code map ignore/overwrite/concatenate to ours/theirs/union, without teaching the notes-merge code about these words. Or maybe even drop this patch (and the next?) entirely, and let the future author (who implements notes rewrite in terms of notes merge) decide how to deal with this? By committing to these synonyms now, you might actually be making things harder for the future author: once the synonyms are part of the user-visible and documented interface, they cannot easily be removed/changed again. ...Johan > Add tests for the new synonyms. > > Teaching rewrite how to understand merge terminology is left for a > following patch. > > Signed-off-by: Jacob Keller <jacob.kel...@gmail.com> -- Johan Herland, <jo...@herland.net> www.herland.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
