4 ms·
The blogger does not understand Git, fundamentally. Git does does not work with text. It stores snapshots of artifacts. The diffs that you see when you use th
by kazinator 5y ago
The blogger does not understand Git, fundamentally.
Git does does not work with text. It stores snapshots of artifacts.
The diffs that you see when you use the various commands like git log -p are recovered from the snapshots, when those artifacts happen to be text files.
Git absolutely works with texts when you connect it with external representations and tooling, such as when you "git format-patch" and then "git am" to import that; and the rebasing workflows obviously have textual merging with conflict resolution. Still, that seems like something that could be externalized. A language-specific three-way-diff tool can handle a merge by parsing all three pieces and working with ASTs. It's something that could be developed later, yet still work with your old commits.
There is this: https://git-scm.com/docs/git-mergetool https://git-scm.com/docs/git-mergetool
No idea how well it works.