I use interactive rebases to clean up the history of messy branches so they can be reviewed commit by commit, with each commit representing one logical unit or type of change.
Mind you, getting those wrong is a quick way to making commits disappear into nothingness. Still useful if you’re careful. (Or you can just create a second temporary branch you can fall back onto of you need up your first once.)
If you’re using “trunk-based development” (everything is a PR branch or in main), this works great.
If you’re using GitFlow, it can make PRs between the major prod/dev/staging branches super messy. It would be nice if GitHub would let you define which merge strategies are allowed per-branch, but that’s not a thing (AFAIK). So you’re probably better off not squashing in this situation.
The way I structure my commits, it is usually (but not always) easier and more reliable for me to replay my commits one at a time on top of the main branch and see how each relatively small change needs to be adapted in isolation–running the full test suite at each step to verify that my changes were correct–than to be presented with a slew of changes all at once that result from marrying all of my changes with all of the changes made to the main branch at once. So I generally start by attempting a rebase and fall back to a merge if that ends up creating more problems than it solves.
Only before you collaborate with anyone else. After that, don’t ever use rebase, or they’ll get an error, and will have to overwrite their local history with the one you’ve rewritten.
The meme says “IRS”, so it’s obviously intended to refer to America.
But outside of that context, they’d fucking deserve it for their shitty dark pattern UX trying to export American tipping culture into the civilised world. If people want to tip, they can do it using cash (so the money actually goes to the person you intended it to!). Or at most, there could be a little “tip” button in the corner somewhere that then takes you to a page like this. It shouldn’t be shoved in our faces like this.
Camden in Sydney? That’s appalling. It’s bad enough to be presented with a screen like in the OP. Needing to actually speak to a person to not have a tip added sounds probably illegal.
Ah right, cheers. Tbh my first guess was that it might be a place in Britain, but I didn’t know so I Googled it and all the results were about Sydney (including one from brittanica.com…).
Well, we did almost end up in Canberra at one point, but as luck would have it the wife’s boss didn’t support the transfer. It’s no Sydney, but anything would have been better than staying stateside. I don’t really miss it, and all my friends say it’s worse now 🙂
In most places even if you tip cash they are supposed to keep that for the tip pool and it is split. Often among the cook staff and other people at the restaurant.
Live in a country where tipping is practically unheard of. Lately pay terminals have started appearing in restaurants that have asking for tip enabled by default, and restaurants often don’t know how to disable it.
Well, at least there are some safeguards. I was handed the terminal so I put in my PIN code, not realising it was actually asking for a tip. I was pretty confused when it said “value too high” or something like that.
The owners know how. They also know that by leaving it there they make extra money on top of sales. They also know that the person getting berated for having it there is the worker who can’t change it.
Owners are often the biggest morons at the location.
Before that, I used the same basic software package at Subway because the owner couldn’t be bothered, and the manager, great lady, was not technically apt.
Am farmer, can confirm. I also have my chequebook with me… Non-farmers, when was the last time you wrote a cheque, aside from rent? I feel like we’re the only ones still using them.
Americunts shit on you when you tell them tipping culture is bad. Like, here in my third world country, where we all earn a misery compared to the minimum wage in burger land, we can say no to tips or just give a few cents or some more…fuck this. Food is already expensive. I am not going to waste extra cash for my food.
I’ve seen plenty of wait staff show up to defend tipping in Reddit threads. They’d rather shame customers than demand fair wages from their employers. Or maybe they were all just bots.
I think those people tend to make a lot of money off tips. There have been times I could get way more than you’d get from any paycheck a restaurant would ever be willing to pay, even with the laws changed for that sector, for “less” work. Depending on the place you work at you could have $300+ a night cash Friday-Sunday and that’s me going back to what I remember from 12 years ago so who knows what they’re able to get now.
I don’t even make $900 a week now in a psudo-managment position in a factory. Not that the $900 is consistent there for those in food service, I just think that’s one reason people would be openly resistant to the idea of changing how tipping works.
And tipping culture has creeped in both magnitude (i.e. 15% used to be standard, but now it’s the low end) and scope (e.g. tips prompts at fucking fast food places)
Plenty. I have had people tell me I am inhumane for criticising tipping culture, and if I point out it is related to the extreme class system and slavery history of America they downvote me to hell and try to justify that it is “land of tha free” or whatever.
They don’t even have freedom from hunger or illness in their messed up country.
I’ve seen a lot of people, including servers and diners, defending tipping culture.
Sadly.
I’m on the side of tipping while in a tipping culture, but only because of the crap way servers are payed and they’re the only ones hurt by protesting through refusing to tip. Otherwise, it’s a practice that needs to die.
I think this is a fake quote that somebody made up for an Internet comedy bit, since it seems unlikely for Hollywood actress Sydney Sweeney to have such uncharacteristically strong opinion on software version control, of all things.
Because she of all people would know that there isn’t anything wrong with using git merge, and it ultimately comes down to personal preference to what you are used to.
But esteemed Academy Award nominated character actress and film director, Margot Robbie, if it’s unlikely that Hollywood actress Sydney Sweeney said this… wouldn’t it be just as unlikely that Margot Robbie would be here? Adding her own comment?
… are you projecting? Is there something you want to tell us esteemed Academy Award nominated character actress and film director Margot Robbie?
Margot Robbie, I was about to agree with you and thought that was a very reasonable take, until you tried to argue that git merge is better than git rebase, then I simply had to disregard the whole thing.
…and? You squash so all your gross “isort” “forgot to commit this file” “WIP but I’m getting lunch” commits can be cleaned up into a single “Add endpoint to allow users to set their blah blah” comment with a nice extended description.
You then rebase so you have a nice linear history with no weird merge commits hanging around.
Okay honest question, when you merge a PR in GitHub and choose the squash commits box is that “rebasing”? Or is that just squashing? Because it seems that achieves the same thing you’re talking about.
You should IMO always do this when putting your work on a shared branch
No. You should never squash as a rule unless your entire team can’t be bothered to use git correctly and in that case it’s a workaround for that problem, not a generally good policy.
Automatic squashes make it impossible to split commit into logical units of work. It reduces every feature branch into a single commit which is quite stupid.
If you ever needed to look at a list of feature branch changes with one feature branch per line for some reason, the correct tool to use is a first-parent log. In a proper git history, that will show you all the merge commits on the main branch; one per feature branch; as if you had squashed.
Rebase “merges” are similarly stupid: You lose the entire notion of what happened together as a unit of work; what was part of the same feature branch and what wasn’t. Merge commits denote the end of a feature branch and together with the merge base you can always determine what was committed as part of which feature branch.
Note that I didn’t say that you should never squash commits. You should do that but with the intention of producing a clearer history, not as a general rule eliminating any possibly useful history.
You squash so all your gross “isort” “forgot to commit this file” “WIP but I’m getting lunch” commits can be cleaned up
The next step on the Git-journey is to use interactive rebasing in order to never push these commits in the first place and maintain a clean history to be consumed by the code reviewer.
Squashing is still nice in order to have a one-to-one relationship between commits on the main branch to pull requests merged, imo.
Okay this is the second time I’ve seen Sydney Sweeney referenced in a meme in less than half a day. I had never heard of her before. Who is she, and why is she suddenly attracting so much meme attention?
She is from Spokane Washington not Australia. She got a lot of recognition for her role in Euphoria and is blowing up a bit right now because she is a young, attractive, talented actress.
She’s an American actress who was in Handmaid’s Tale and a few other things and then blew up thanks to her role in Euphoria. She’s become a bit of a meme recently because online conservatives think that her boobs are anti-woke
I’ve had transactions flagged for (intentionally) leaving large tips before. These large tips were justified for various reasons, such as comped meals.
What makes you think it was flagged for a large tip specifically, rather than just an unusually high transaction?
It still confused me how they would know it was a $20 steak and $80 tip versus 5x $20 steaks and no tip. It would appear the same, a $100 transaction at Bob’s Steakhouse.
The message specifically said it was due to the “unusually large tip”. They wanted me to confirm that it was intended.
If the article linked below is to be believed, the credit card company does indeed know how much of the transaction is a tip due to the way the transaction is processed. Note that this was at a full-service restaurant, not tipping at the counter for fast food or some other thing.
Consider when you pay with a credit card at a sit-down restaurant, they read the card first. Then you write in the tip on the receipt, meaning that they process this part later after the initial card reading. It is probably different with the tabletop self-checkout devices though.
I hate %, give me a option to round up to the nearest 5. This is useful for my financial tracking, and I’m willing to bet a lot of people would like nice round numbers. If I buy a coffee or whatever and it’s $7 I round up to $10, not because I’m trying to give a good tip but because it’s more convenient for me when I’m sitting there doing my finances (I track everything) and while I know that not everyone would universally agree maybe they would only want to round up to the nearest whole dollar the fact remains I feel like most places would actually end up with more total tips overall if that was a one button option
I know how to use git pull, git push, git commit, git status and git add *. I don’t even know how git commit and git push works I just know you run them in that order. Whenever I break everything I give up and go outside.
programmer_humor
Oldest
This magazine is from a federated server and may be incomplete. Browse more on the original instance.