On Tue, Feb 20, 2018 at 1:44 PM, John Cremona <john.crem...@gmail.com> wrote: > 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.
+1 For the release manager who actually does the merges this is probably useful. Though we would also have to add it to the Sage Trac plugin and patchbot so that they don't show branches as unmergeable (and at least for some branches we do want to see whitespace changes, so I'm not exactly sure how best to manage that) > On 20 February 2018 at 12:23, Vincent Delecroix <20100.delecr...@gmail.com> > wrote: >> >> On 20/02/2018 12:45, Erik Bray wrote: >>> >>> On Tue, Feb 20, 2018 at 12:22 PM, Daniel Krenn <kr...@aon.at> 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 sage-devel+unsubscr...@googlegroups.com. >> To post to this group, send email to sage-devel@googlegroups.com. >> 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 sage-devel+unsubscr...@googlegroups.com. > To post to this group, send email to sage-devel@googlegroups.com. > 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 sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
