Oui très bien! ☺️
Oui très bien! ☺️
Le Québec vous dit bonjour!
Mine will probably be Bottles.
The team behind that application did a fantastic job. Wine was due for something much more user friendly like this. And integration with Proton, allowing 3D acceleration is the cherry on top.
Wasn’t that one hell of a plot twist eh? The guy became an icon and we finally find out about this year’s later.
Fuuuuuucking hell…
I was going to say the same. This was my introduction to MST3K as well.
The movie’s theme song, the actors, the plot and the cast’s comments were the cherry on top.
Oh yeah I see what you mean.
Those things are everywhere in Japan. They really applied themselves there.
This could be any metro station in Montréal, Québec.
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
Especially if the topic is sex, as OP claims. Like WTF.