Depressingly bad argument that seems to say: we think it’s bad for children and adults, but we don’t ban it for adults so we shouldn’t ban it for children.
It’s more accurately: but we _cannot_, or maybe even, do not have the political will to ban it for adults. The point is that it’s politically easy to ban something for those who cannot vote for you.
I don’t think (could be wrong) the argument is don’t ban social media for children because we don’t ban it for adults… I think the argument is it is easier politically to regulate behavior of a population that doesn’t vote and is not us.
English societies have a long history of regulating the behavior of others - see English Poor Laws.
It’s an interesting perspective at least, I hadn’t thought of the social media ban in that way.
I happen to think we should still ban bad things (smoking, drinking, gambling, and probably social media) for kids. But I appreciate the argument.
It's not what it says, it's more: discussion on what to ban/regulate should include all the population at risk (so in this case, the entire population), not just people at non-voting age. It doesn't even say that whe should apply the same regulation to children and adults, but pretending that something is harmful up until 16, then doesn't need any kind of regulation, is just pretending
Perhaps. But you can see the DX of rebase is abysmal compared to merge. squash, rerere, force push, remember to push to remote before rebase, more coordination if multiple people are working on feature branch etc.
I still prefer merge. Its simple and gets out of my way as long as I dont care about purity of history
Cook very large or numerous portions. Use what you need for 1 meal, freeze the rest to save for future meals. Based on how much your family eats in that first meal, divide up the remaining amount into that sized portions when freezing. Warm up the frozen food in the oven (still may take an hour, but you can do other things during that time).
Frozen vegetables are pretty cheap and easy to warm up quickly in the microwave or an air fryer. They may not be as good for you as fresh produce, but that can be a reasonable tradeoff based on the season and free time.
Chest freezers are reasonably cheap to buy (new or used) and cheap to operate, assuming you have the physical space and an open electrical outlet. They don't consume much electricity, mine uses about 75W for the compressor (when it's running, which is less than 50% of the time) and about 250W for the defrost heaters (which seem to turn on for about 15 minutes roughly once per day.
One extra thing to consider is preparing something that can transform easily into many dishes.
We cook a "big meal" every weekend (now in winter time is chickpea+meat stew - "cocido madrileño"). It takes around 1 hour to make, but the time is not proportional to the quantity. So we make enough for 3-4 meals for my family of 3 on a big pot.
The nice thing about this stew in particular is that you can reserve the liquid, meat and chickpeas in separate containers in the fridge. The liquid is a very good base broth for soups (heat up, add some noodles, done in minutes).
The meat can be consumed cold, or can be the meaty base of other things (croquettes). We can also rebuild the dish by adding broth, chickpeas and meat into a plate and microwaving it (again, minutes). Or we can add some rice and have a "paella de cocido" (that takes a bit longer, around 25 minutes).
You have to adapt this idea to whatever is available to you in your area and your personal tastes. Perhaps you can prepare a big batch of mexican food, to eat in tacos/wraps/with salad. Or some curry base that can double up as a soup.
It’s definitely some marketing, but way less than it could be. It recommends looking at the redis docs to build a reds client rather than the websites own tutorial/paid product for doing so.
I’m all ears for a better approach because squashing seems like a good way to preserve only useful information.
My history ends up being:
- add feature x
- linting
- add e2e tests
- formatting
- additional comments for feature
- fix broken test (ci caught this)
- update README for new feature
- linting
With a squash it can boil down to just “added feature x” with smaller changes inside the description.
If my change is small enough that it can be treated as one logical unit, that will be reviewed, merged and (hopefully not) reverted as one unit, all these followup commits will be amends into the original commit. There's nothing wrong with small changes containing just one commit; even if the work wasn't written or committed at one time.
Where logical commits (also called atomic commits) really shine is when you're making multiple logically distinct changes that depend on each other. E.g. "convert subsystem A to use api Y instead of deprecated api X", "remove now-unused api X", "implement feature B in api Y", "expose feature B in subsystem A". Now they can be reviewed independently, and if feature B turns out to need more work, the first commits can be merged independently (or if that's discovered after it's already merged, the last commits can be reverted independently).
If after creating (or pushing) this sequence of commits, I need to fix linting/formatting/CI, I'll put the fixes in a fixup commit for the appropriate and meld them using a rebase. Takes about 30s to do manually, and can be automated using tools like git-absorb. However, in reality I don't need to do this often: the breakdown of bigger tasks into logical chunks is something I already do, as it helps me to stay focused, and I add tests and run linting/formatting/etc before I commit.
And yes, more or less the same result can be achieved by creating multiple MRs and using squashing; but usually that's a much worse experience.
That seems better as long as you can keep it standard across the team. I don’t usually check each commit when reviewing since frequent iterative commits mean folks change their mind and I’d review already removed logic when looking at early commits.
I’ve been scraping by on basic git usage so didn’t know about fix-up commits, that’s excellent.
You can always take advantage of the graph structure itself. With `--first-parent` git log just shows your integration points (top level merge commits, PR merges with `--no-ff`) like `Added feature X`. `--first-parent` applies to blame, bisect, and other commands as well. When you "need" or most want linear history you have `--first-parent` and when you need the details "inside" a previous integration you can still get to them. You can preserve all information and yet focus only on the top-level information by default.
It's just too bad not enough graphical UIs default to `--first-parent` and a drill-down like approach over cluttered "subway graphs".
stacked diffs are the best approach and working at a company that uses them and reading about the "pull request" workflow that everyone else subjects themselves to makes me wonder why everyone is not using stacked diffs instead of repeating this "squash vs. not squash" debate eternally.
every commit is reviewed individually. every commit must have a meaningful message, no "wip fix whatever" nonsense. every commit must pass CI. every commit is pushed to master in order.
What are you referring to? I may be missing a line from the article but it seems mostly focused around a lingering GitHub Actions bug and the direction of GitHub.
Then... don't use GHA and move to other CI/CD/Workflow platform.
If you try it, don't like it then don't use it, GitHub does not force you to use GHA anyway, and moving away from GitHub due to their direction sounds like a political movement. It's like someone who stop shopping from Walmart, not because they sells bad product but because they support the Republic, then going to a local shop that sometimes close unexpectedly sound unreasonable.
reply