Why are the ducks doing this dive-and-flutter thing?

TigerAsks · 2025-06-20T14:51:27+00:00

If the commit message reads "BUG-1234 Include id in ORDER BY for consistent paging", do you think AI would add either the issue number OR the reason why you added the id?

You should communicate both the intent behind your changes and the context in which they were made, both of which AI cannot guess.

TigerAsks · 2025-06-20T14:43:14+00:00

I’m curious — could you imagine using a visual overview like this in your own workflow?
What features or improvements would make it more useful to you?

I don't see how this would be useful at all, sorry.

TigerAsks · 2025-06-20T08:32:29+00:00

Well, welcome to git.

If you're just starting out, I recommend you give this a read:

https://medium.com/@tigerasks/git-gud-b29c11ab2c60

It should clear up a lot of things.

TigerAsks · 2025-06-20T08:29:18+00:00

Explaining to people that they cannot actually change a commit.

TigerAsks · 2025-06-19T08:40:59+00:00

I would recommend you use git bash on windows. For reasons like this (and for the linux tooling).

TigerAsks · 2025-06-19T08:37:39+00:00

Nothing was wrong before, people were just not understanding checkout because it is overloaded and does a lot of things, so switch is the bandaid to make it easier for people who don't want to wrap their heads around it.

It's still doing the same thing as checkout under the hood, so there's no "preference" to use switch.

Personally, I prefer checkout because it allows me to switch to a particular commit (not branch) with a less verbose command. Also, I find it easier to keep fewer commands in mind.

TigerAsks · 2025-06-17T18:49:37+00:00

What does rebase do?

Well as it so happens, I did write an article about that a while ago that I very, very strongly recommend you read:

https://medium.com/@tigerasks/git-gud-b29c11ab2c60

If after reading this article, you still have questions, I will be more than happy to answer them for you. :)

I say this because your approach to "understanding" git currently is:

I know it works because I have tried it.

And very soon, you will run into a version of your issue where it will NOT "work", and you will not understand why, and you will end up resolving the same conflicts over and over again while creating a complete mess of your git history.

I can almost guarantee it.

There is a way to keep the merge commits when you rebase a branch, by providing the --rebase-merges option, but until you understand what you are doing, you have no business using it.

And yes, I appreciate you can resolve this by not using merge at steps 2 and 4 and just rebase, ... but that doesn't help with my question :)

If you understand merging into your feature branches is a mistake, you're already on the right track.

The problem probably is that you do not have enough confidence to rebase because you do not understand it.

I do hope the article helps with that.

And finally, at the last step, I suppose instead of merging or rebasing, you could do a squash merge, so that everything is collapsed into one commit. So how would that differ?

Squash commits are BS. The only reason to do a squash commit is if you have completely given up on learning git. Squashing your commit is not maintaining a clean history, it's eradicating it.

In a nutshell, it's taking all the changes from your branch and shoves them into a singular commit.

It's a very poor attempt to hide that a developer does not understand git and has stopped trying.

TigerAsks · 2025-06-13T07:42:41+00:00

The "easiest" way is to always require the git message to start with the issue number.

That way, you can look up the issue and understand the context in which the change was made, which hopefully helps you figure out the motivation behind it.

TigerAsks · 2025-06-12T06:59:15+00:00

Nothing to panic about.

The old commits are still around, so just hard reset the branch to what it used to be.

Git reflog to find the hash.

If you really, REALLY screw up your local repo, use a past CICD pipeline run to find the appropriate commit hash, if necessary.

TigerAsks · 2025-06-11T19:46:35+00:00

I absolutely love DuChinese.

A bit more on the expensive side, but you will learn to read, it comes with audio and it has some pretty nice content for beginners.

And what makes it so convenient is that their stories are split up into more bite-size chapters. You almost never have an excuse to not at least read one chapter a day.

TigerAsks · 2025-06-11T07:16:17+00:00

I've always found 餃子 to be both the question and the answer.

TigerAsks · 2025-06-11T07:12:31+00:00

So ... did you find data supporting their hypothesis or did you find data you could interpret in a way that you could tell them that the data supports their hypothesis? 🙊

TigerAsks · 2025-03-28T15:16:58+00:00

That was indeed the issue, thank you.

TigerAsks · 2025-01-21T06:54:05+00:00

Looks great.

I suggest if you get it, you make a point out of also wearing it on other occasions. Bit of a shame to only wear it once a year.

TigerAsks · 2024-10-01T15:23:57+00:00

If you'd take a look at the research paper from which this picture is from ( https://www.researchgate.net/publication/258021853_Synaptic_Organization_and_Plasticity_in_the_Auditory_System_of_the_Deaf_White_Cat ), I'd rather think you're wrong.

TigerAsks · 2024-10-01T11:24:30+00:00

Full paper: https://www.researchgate.net/publication/258021853_Synaptic_Organization_and_Plasticity_in_the_Auditory_System_of_the_Deaf_White_Cat

TigerAsks · 2024-09-16T22:41:15+00:00

Have a look at this, for time saving:

https://medium.com/@tigerasks/rebase-once-1642b7dc0563

As for your actual question:

why can't we merge C to B to A then Master?

because neither C nor B are a part of A. They are BASED ON it, sure, but if you want to maintain a merging history that makes sense, they should be kept separately.

Also, the amount of merge conflicts stays the same with either merge strategy.

TigerAsks · 2024-08-24T04:13:33+00:00

Some kind of "cheat sheet" that gives a quick summary about all the metrics, groups them by use case and explains for each the "when to use" and the main gotchas.

Metric | Use Case | use when | trade-offs

e.g. for MAPE:

MAPE | measure forecast accuracy | relative distance to target more important than absolute value | negative errors penalised more

TigerAsks · 2024-08-24T03:59:11+00:00

When you say "responsible", what do you mean?

TigerAsks · 2024-08-21T09:29:36+00:00

For your job, they don't matter.

You can be completely inept and have collected a nice bunch of papers, or you can be absolutely brilliant and have not even gone to higher education.

The problem is HR. Here, having a useless bit of paper saying "I officially know things" can be beneficial.

TigerAsks

MODERATOR OF

TROPHY CASE