"Git is to github what porn is to pornhub"
56or you to youtube...
2to YouTube, you're youseless if you're yousing youBlock origin.
2
I almost got a bingo by checking off things I've muttered to myself.
39I would've... but mercurial isn't better.
As an aside, stop merging into in-progress private branches.... it makes the absolute worst conflicts.
12[rebase needed]
2I've had that kind of reaction - on rebases also - and most times it was in fact a code smell pointing to a case of spaghetti code.
If you get to the point that you fear upstream merges/rebases into your WIP, stop for a second and ask yourself if maybe that might be an issue with too much interpendencies inside the code itself. Code should be as close to an directed acrylic graph as possible. (doesn't count, I was not speaking of git! :b )
2
I checked a lot of them, but no bingo. scattered all over
9I’ve said both subversion was better, and worse before for sure. PTSD is making it hard to remember what I’ve said when trying to remove a PSD of mpeg you accidentally committed in the first commit and just noticed as you cloned the repo home and it was 2gb for a 3 page website.
3
I propose: "how the f**k do i discard submodule changes"
9Delete the entire directory and re clone it of course
5
commits are immutable snapshots
git interactive rebase enters, stage right
6Which makes a new commit. The old commit before the rebase is still there until it's garbage collected. Editing a commit in any way changes its hash, turning it into a new commit.
4
- Make Structured Commits by context
- Make a MR
- Forgot to Rebase
- Close MR
- Rebase
- Make a MR
- Forgot to push the Rebase so now all Rebase items are on my MR
- Close MR
- Reset Changes
- Push Rebased Items
- Make Structured Commits,
- Forget a file
- Reset Changes
- Make a mega Commit
- Make a MR
- Pipeline fails
5git is a blockchain without a proof of work
4The proof of work is the commit content itself! Unlike some arbitrary brute force task of no value.
2In some cases it's "proof of slacking off"
1
I love git until it backfires which at that point I fucking hate git
3force push for release
3I get more than half the spaces, all the negative ones, but can't quite make a bingo without the center, which is the kind of pro-giving a shit about git nonsense I'd never utter.
I miss subversion and perforce.
2My friend and I are looking to make a game and the general consensus has been that perforce is still better than git LFS, so we're setting up a perforce server. What is it about SVN and perforce that you miss? I've only ever used git professionally for VCS so I'm finding perforce's always-online and exclusive-checkouts model just very strange (though I understand the need for it when working with binary files).
1Perforce is great for dealing with media files, artists can actually use it without producing 500 variants of -new-old-2022-final-dontuse-revised-1.1-2023 filenames (I AM NOT JOKING.), and it doesn't slow down with a lot of media like git does (which has to check out the entire history). Since usually only one artist touches a file at a time, locking doesn't slow them down.
Subversion's kind of the same for devs. There's a single source of truth, merging and branching is a lot easier, but it's less possessive about files. You can do media in it, better than git, but not as nicely as p4. I have seen the -new-old filenames end up in svn, but if you delete a file and commit, it goes away.
1
I've been using git for 20 years and have no idea how it works. Probably will be the next things I will do a deep dive into.
1Git isn't even that old. It was first publicly released in 2005. Unless you're literally Linus Torvalds, it's impossible to have used it that long. And I assume Linus does have a pretty good idea of how it works.
2
I stand by my opinion that git should be the what VCS software uses internally and is built on. It's an API for VCS developers to use. And repon admins.
Thev actual VCS should have it's own API and CLI that is intuitive and shouldn't require understanding the underlying data structure.
1If that's what you're looking for, then: https://gitless.com/
3That is what I want. Now if only it was more widespread and my employer allowed it lol
1
