2 ms·
<<<HEAD Version control is not solved, and that it works line by line is part of the problem.
by amadeuspagel 2y ago
<<<HEAD
Version control is not solved, and that it works line by line is part of the problem.
- ziml77 2y agoThis is very true. Line merges do not always work well. There used to be a tool called SemanticMerge which was able to handle merging code cleanly even when the code had been refactored. It saved me quite a bit of work a handful of times (before it was taken away because the company needed a value add for their paid version control software).