![](/static/253f0d9b/assets/icons/icon-96x96.png)
![](https://programming.dev/pictrs/image/170721ad-9010-470f-a4a4-ead95f51f13b.png)
Probably a mathematician or physicist somewhere.
I hate reading the code I wrote two days ago.
Probably a mathematician or physicist somewhere.
I hate reading the code I wrote two days ago.
I tend to add is to booleans toreally differentiate between a method name and a status.
def open_file_dialog(self):
self.dialog_file_is_open = True
pass
That way, it’s easier for my dumb brain to spot which is which at a glance.
Yeah I was confused because you are right, merge is usually refered as the git merge and then git commit.
It makes sense. Thanks for the clarification
Thanks for the example. Rebase use is clearer now.
I have the bad habit of leaving checkpoints everywhere because of merge squash that I am trying to fix. I think that forcing myself to rebase would help get rid of that habit. And the good thing is that I am the sole FW dev at work, so I can do whatever I want with the repos.
How would rebasing my own branch work? Do I rebase the main into my branch, or make a copy of the main branch and then rebase? I have trouble grasping how that would work.
Thanks for the explanation. It makes sense. To my untrained eyes, it feels like both merge and rebase have their use. I will try to keep that in mind.
When rebasing, it applies the changes without the commit history?
Does that mean that when you fast forward your main/dev branch and commit, you then add a single commit that encompasses every changes that were rebase?
I know this is a meme post, but can someone succinctly explain rebase vs merge?
I am an amateur trying to learn my tool.
To me, RGB is like a cheap car with a bad paint job and too many neon. If I could put my computer in a closet, I would.
Yeah I know. It’s just that usually, I see people interchangeably use liberal and left and it took a moment to register that this wasn’t the case.
The issue is that depending on where the Instance is located can mean that the person is liable for the content on their instance, or at least some corps will try to take them to court over that.
It would be really nice to have something you’ve described, but then who hosts the community and becomes liable?
I’m so used to people using liberals for the US left, that I forgot that liberals are on the right when I’ve first read your comment for a moment.
Funny because HR doesn’t know either and its their job. In the US, you just need to slap engineer at the end and you are golden.
Lots of people think that computers are magic box. And now a diffuse entity in the cloud talk to them? Big heads will gobble that shit up.
The US add engineer to everything to sound most prestigious than they are. If you sell your service as a AI prompt writer, you get paid peanuts. If you sell the same service as AI prompt engineer, the C-Suites cream their pants.
It really isn’t because Netflix did it easily in the 2010s. But then, as always, capitalism got in the way and we are back to the cable era where even if you pay, you still have ads.
I call that a checkpoint when I do it. But I do that on my branch that will eventually be squash merged.
Some people are more diurnal, some are more nocturnal.
My productivity peak is between 8PM and 11PM, but with kids this is impossible.
I write better code everyday because yesterday code always looks bad haha.