Cyborganism

ISO 8601

Ditto.

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.

Absolutely

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.

No, they aren’t. They aren’t by any means.

Maybe there are more posts from that instance, but there is no one trying to then extend the protocol with the objective of requesting special features and then killing off the protocol.

DST people should get hung. By three balls. Fuck them.

Holy shit! Yes!!! Having worked with time sensitive data, it’s such bullshit.

Damn autocorrect…

That doesn’t make any sense. Why not just use PowerShell directly then? Why use Bash or even command line and a batch file? It sounds to me like you’re over-complicating things for nothing and putting the blame on Microsoft for some reason.

I’m a heavy Bash user myself and often find myself struggling a bit with PowerShell trying to look for equivalent commands. (commandlets?) But, the more I use it, the more I understand how it works and the more I improve my skills at using it.

I know a lot of people like to shit on Microsoft, but seriously give their PowerShell a chance. It has its strengths. It’s especially nice with Oh My Posh running in Windows Terminal.

That sounds like you don’t know what you’re doing. No offense.

Oh I’ve been using Linux for over 20 years. That’s not an issue.

I have a better idea now of what an immutable distro is thanks to your explanation. I don’t know if that’s what I would want after all.

I think I prefer the freedom of being able to modify my system files and configs as I need to customize my system as I see fit, even if it meansb potentially breaking something.

What parts of the immutable OS are read only? Like filesystem wise? I’m not sure I really get it.

That seems like a solid OS. It’s there an Ubuntu based variant?