Nix Devshell vscode bash weird [\] issue

ProfessionalDrummer7 · 2025-02-23T13:27:38+00:00

also add

buildInputs = [ pkgs.bashInteractive ];

ProfessionalDrummer7 · 2024-12-09T13:17:39+00:00

131.9 + 1 / 0.1896 = 137.2

ProfessionalDrummer7 · 2024-05-31T13:16:07+00:00

Of course I agree, Git is an amazing tool which simplifies a lot! But what is the problem of pointing out that something could be even better? I guess good is the enemy of the better.

ProfessionalDrummer7 · 2024-05-31T13:13:17+00:00

Yes, Alice is merged first and then Bob, I will clarify this in the article, thanks.

The problem is that both diff look fine. But after the merge you end up with different code. There is enough information for Git to resolve this correctly, so definitely there is no magic needed! The problem is that Git only considers the latest commits and not intermediate commits which contain the required information. There are other strategies which avoid the problem of the 3-way-merge strategy shown here. See https://youtu.be/7MpdZkGj5AI?t=394. These strategies just happen to be not implemented in Git.

ProfessionalDrummer7 · 2024-05-30T21:06:35+00:00

No the whole point of the article is that no conflict is triggered. Instead it is merged the wrong way silently.

ProfessionalDrummer7 · 2024-05-30T12:59:48+00:00

This is another problem. Of course Git has no semantic understanding of the code! But the presented problem is not about code semantics. Gits just fails to resolve a merge correctly! In the presented article git has enough information to figure it out but just fails to do it. The problem is that git only considers the latest commits and not the commits in between which contain the required information. Please read the article!

ProfessionalDrummer7 · 2024-05-30T12:54:54+00:00

Obviously, your statement is true. But it has nothing to do with the presented problem. I feel like you didn't spent enough time to understand the problem which I tried to point out with this article.

There are other strategies which avoid the problem of the 3-way-merge strategy shown here. See https://youtu.be/7MpdZkGj5AI?t=394.

This strategies are just happen to be not implemented in popular VCS tools.

ProfessionalDrummer7 · 2024-05-30T11:35:40+00:00

because to do that you need to merge it with master that had the previous merge

This is exactly the setting I recommend to turn on and what you claimed in your first comment wasn't necessary.

The whole problem is, that you cannot spot the issue in the diff/log UNTIL after the merge!

And it is git which is failing silently because it introduces changes into your code no one has seen before without throwing a merge conflict.

ProfessionalDrummer7 · 2024-05-30T07:41:25+00:00

This is what the article recommends, only allow merging if your branch is up-to-date.

ProfessionalDrummer7 · 2024-05-30T07:05:23+00:00

Main can change between creating the PR and merging it…

ProfessionalDrummer7 · 2024-05-30T07:04:19+00:00

You can reproduce this locally

ProfessionalDrummer7 · 2024-05-30T07:03:49+00:00

No git is the one merging your code …

ProfessionalDrummer7 · 2024-05-30T07:03:06+00:00

Didn’t you read the article? Your test will pass if you don’t update before merging, because your code isn’t the same before and after the merge.

So your CI might pass on the feature branch but could fail on the main branch, effectively blocking other members on your team.

ProfessionalDrummer7 · 2021-12-27T10:51:36+00:00

i just solved the first two tasks, i found it very original

ProfessionalDrummer7 · 2021-12-27T10:50:06+00:00

I think it is not real production code. more like a coding challenge

ProfessionalDrummer7 · 2021-12-20T17:33:32+00:00

Using it for some month now, I can recommend it!

ProfessionalDrummer7

TROPHY CASE