31–34 of 34 posts
Git GUIs are a crutch, perhaps that's what your pupil needs right now, but not forever. Windows novices may not realise that git can be a local program contained in a folder, so making a repo to test how a verb works costs you nothing.
Goddamn do all the people who comment here work on linux and only through the command line, and have never used a git GUI before? There's barely any proper advice from a windows-gitgui user here. On windows start with TortoiseGit, if he used TortoiseSVN before he'll get it. Right-clicking on a file/folder will bring up a context menu that windows users will be very familiar with, plus it has labels that even a comman…
Sublime Merge is my preferred Git GUI. https://www.sublimemerge.com
Earlier quoted context omitted.
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 I value good mental models. What behavior did the difference between fake and real deltas explain?
>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 o…
Goddamn do all the people who comment here work on linux and only through the command line, and have never used a git GUI before? There's barely any proper advice from a windows-gitgui user here. On windows start with TortoiseGit, if he used TortoiseSVN before he'll get it. Right-clicking on a file/folder will bring up a context menu that windows users will be very familiar with, plus it has labels that even a comman…