No, the previous post above is correct: > Each commit contains a complete exact snapshot of the entire repository. On the other hand it does contain optimizati

No, the previous post above is correct: > Each commit contains a complete exact snapshot of the entire repository. On the other hand it does contain optimizations to reduce the size of these snapshots in the form of git packs I think the problem that you describe is that the divergent branches have made changes in the same file that cannot be automatically reconciled?