News for hackers. Stuff that matters.

A comment on Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts. Parent comment

Re:Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts by j_s on Tuesday January 02, 2018 @08:34PM (#16057573)
https://semanticmerge.com seemed unique to me, and https://www.gmaster.io experiments with going farther.
[ Parent | on HN ]
Re:Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts by partycoder on Wednesday January 03, 2018 @03:09AM (#16059356)
Semantic patching can be good to resolve conflicts, but version control operates with non-semantic changes.

This can be frustrating at times, since many code bases cannot be reformatted or refactored because it affects version control history.

[ Parent | on HN ]