Cyborganism
- 0 Posts
- 123 Comments
I agree.
Unfortunately, from experience, nobody seems to have time for that. They just learn git pull, push, add, commit and merge and that’s about it.
Sometimes they’ll use checkout and end up in detached head and have a panic attack. That’s when I come in. lol
Yeah that’s what I did as a workaround. Reset (soft) to the first parent commit and do a single commit with all the changes.
What I do locally on my branch is my own business.
Honestly, when doing a merge/pull request into the parent branch, that’s when you squash. You don’t need the entire history of a development branch in main.
Yeah I saw someone else’s answer and I totally learned something new today.
Holy shit! I never took the time to read about it rerere. But it all makes sense now.
However, it’s still a lot of extra steps for what could otherwise be really simple with a regular merge.
Is there really a big advantage in using rebase vs merge other than trying to keep a single line of progress in the history? It’s it really worth all the hassle? Especially if you’re using a squash merge in a pull request…
All it can take is one commit in the parent branch. If your branch has many commits because you’re a commit freak then your fucked.
I consider myself above average in terms of Git know how. But I’ve come across situations using rebase where you’re stuck resolving the same conflicts over several commits.
I still don’t understand that part quite well.
This doesn’t happen when you do a normal merge though. Making it easier to manage
You need to merge more often.
Rebase. That’s where the real trauma is.
51·2 months agoYou can still push your changes to a different remote on a different service.
Oh fuck. I better roll back that last deployment then…
He’s just stating the obvious.
Our jobs have no meaning. I didn’t become a software engineer to work on some bloated piece of crap software implementing shoddy code just to make a company manager happy do the CEO can make more money.
I wanted to work in open source and democratize software for the masses.
2·3 months agoYou think I don’t know how a VPN works?
I think you misunderstood what I meant.
How are they different from any other VPN service or even uBlock? They all have access to your browsing info and can potentially use it for profit.
I think there is a big misunderstanding about this feature. People are throwing their arms up in disappointment but in reality this is a helpful feature for privacy.
This post doesn’t even explain what the feature is or how it works. If you take the time to go read what the feature actually does, you’ll see it’s a good feature to have and it really does improve your privacy when you don’t have an ad blocker.
Just because Meta participated doesn’t mean it’s bad. If they only participated as consultants to understand the advertisement system so they can better protect us against it, it’s not bad.
DST people should get hung. By three balls. Fuck them.
ISO 8601