You must log in or register to comment.
“Git is to github what porn is to pornhub”
or you to youtube…
to YouTube, you’re youseless if you’re yousing youBlock origin.
I almost got a bingo by checking off things I’ve muttered to myself.
I would’ve… but mercurial isn’t better.
As an aside, stop merging into in-progress private branches… it makes the absolute worst conflicts.
I’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 )
What’s your workflow that merging into other people’s WIP is normal? I’m so confused
A merge from upstream once a day, at the beginning of the day.
I’m working on a DevOps setting, and even though we’re a small team, we have about two to three changes going through the pipeline a day.
If you keep your fork too long without syncing, it just get more complicated to merge, and more importantly if you need help from the upstream change author they’ll have moved on to another subject and the change won’t be as fresh in their mind as if you had merged the day after they pushed it.
- 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
I love git until it backfires which at that point I fucking hate git
I propose: “how the f**k do i discard submodule changes”
Delete the entire directory and re clone it of course
I checked a lot of them, but no bingo. scattered all over
I’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.
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.
Git 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.
