3 ms·
If a repo has been repacked, that turns it into actual deltas. ctrl-f "git" on this page: https://en.m.wikipedia.org/wiki/Delta_encoding https://en.m.wikipedia.
by mcdonje 3y ago
If a repo has been repacked, that turns it into actual deltas. ctrl-f "git" on this page: https://en.m.wikipedia.org/wiki/Delta_encoding https://en.m.wikipedia.org/wiki/Delta_encoding
I value good mental models. What behavior did the difference between fake and real deltas explain?
- mikewarot 3y ago>What behavior did the difference between fake and real deltas explain? Merges... fscking merges. Merge conflicts are completely unnecessary. Who cares about the delta from the last snapshot?, just store the new snapshot! I've wasted so much time on "merge conflicts" even when I'm the only person, and I've got multiple computers involved. I've completely deleted git repos and rebuilt them to get around the insanity of merges gone bad. (Now I know it's different when you've got multiple programmers, etc... but in the base case, the wrong mental model deranges thinking) The days of pkZIP files of source code on floppy disks NEVER included merge conflicts. GIT is an otherwise amazing upgrade from those days. Sometimes the IDE or other tools mung a file that you don't edit by hand, but need in the archive, and you CAN'T merge it.
- mcdonje 3y agoGotcha. Sounds like a painful lesson. Thank you.