Izaak "Zaak" Beekman
Results
344
comments of
Izaak "Zaak" Beekman
The conflicts in `base/modules/aux` are due, in part, to the fact that you cannot checkout a git branch/working copy on windows if there is a directory named `aux` so we...
@sfilippone I think it's just as much work to merge into `develop` and probably makes more sense for that to be the target. Please let me know if you disagree.