3 ms·
Does this seem difficult to follow to anyone else? The author says the genius is the tracking of the content of the tree and not files. As an example of this
by torstenvl 4y ago
Does this seem difficult to follow to anyone else?
The author says the genius is the tracking of the content of the tree and not files.
As an example of this genius, he shows how git correctly (in his view) errors on the merging of two branches... where the content of the tree has no conflict but the history of a file does (in one branch it was renamed, in another it was deleted).
What am I missing?
- v0idzer0 4y agoThe “history of the file” is inferred here from the delta of the trees. There is no additional metadata needed to know a conflict occurred. Whereas other version control systems would actually store some metadata that you renamed a file and wouldn’t have a conflict here.