3 ms·
No, the main problem is that it screws up merges. Until Git can ignore trailing spaces as part of the merge strategy, it will be a problem when someone removes
by lobster_johnson 14y ago
No, the main problem is that it screws up merges. Until Git can ignore trailing spaces as part of the merge strategy, it will be a problem when someone removes trailing spaces in one patch and someone else modifies (with real code) those same lines. If you have a largeish number of changes it will be a nightmare.
- forrestthewoods 14y agoAraxis Merge, problem solved?
- lobster_johnson 14y agoI don't know it. But unless it's something that comes built into Git it's not useful. It needs to be something everyone has. That's the whole point.
- forrestthewoods 14y agoNah. Use araxis merge and all your issues go away forever. If other devs want to use shitty tools then that's their fault. If you have a repo and are trying to merge pull requests then you definitely should stop using shitty tools. Even if you don't trim whitespace you should have non-shitty tools for local usage. There's no reason to use shitty tools here.
- tmhedberg 14y ago> Until Git can ignore trailing spaces as part of the merge strategy It can: git merge -X ignore-space-at-eol
- lobster_johnson 14y agoGreat, thanks!