Would this help? https://stackoverflow.com/questions/9776527/merging-without-whitespace-conflicts
In brief: git merge -Xignore-space-change There is also a reference there to a commit hook which removes trailing whitespace. On 20 February 2018 at 12:23, Vincent Delecroix <[email protected]> wrote: > On 20/02/2018 12:45, Erik Bray wrote: > >> On Tue, Feb 20, 2018 at 12:22 PM, Daniel Krenn <[email protected]> wrote: >> >>> On 2018-02-20 12:07, Simon King wrote: >>> >>>> Why not doing such cleanup right before releasing a beta version? >>>> >>> >>> Or even better, right before a release, e.g. doing it for a rc0 or rc1. >>> >> >> That was my thinking as well--I'm sure Volker and I could coordinate >> something like that. >> >> However, it could still leave plenty of open tickets with otherwise >> good (but as yet unmerged) branches with trivial merge conflicts :/ >> > > Indeed, this is the problem. Further patches would not apply for > trivial reason. To my mind the best would be to get rid of trailing > whitespaces once and forever (ie not accepting branches with trailing > whitespaces). > > Vincent > > > -- > You received this message because you are subscribed to the Google Groups > "sage-devel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To post to this group, send email to [email protected]. > Visit this group at https://groups.google.com/group/sage-devel. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
