cyborganism

Aw dang. That sucks. But I understand.

Are you sure about that? I dunno if that's correct.

This is the correct response.

At my job we've been asked to remove Docker desktop unless it is absolutely necessary for a client project.

I've just been using Docker through command line via WSL and that's good enough for me.

Same

Ditto.

I love my 2010 Mazda 3. It's basically the same platform as the Ford focus from the same year. If they were able to eventually make a Focus EV, then I'd bet it's possible to do the same with my Mazda.

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

Who cares when it could run Doom in full screen?

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...