3 ms·

Yeah this is true. It’s similar enough such that most gui version control interfaces include an interface to deal with this.

• aragilar 2y ago
  Your editor should be able to handle this (via git mergetool).