News for hackers. Stuff that matters.
Re:We Can Do Better Than SQL by tsimionescu on Tuesday August 11, 2020 @04:23PM (#24125539)
Sorry, I should have been more specific. When I say diffing tool, I mean one that can do what diff does - help Git do automatic merges, and help me do manual merges when auto merge finds conflicts. Two pictures side by side can do neither.
Re:We Can Do Better Than SQL by unityByFreedom on Tuesday August 11, 2020 @07:06PM (#24127008)
I don't see why it couldn't be built. Git merge doesn't always do all the work for you, you still need to evaluate the changes.