Atemu

Atemu , 4 months ago to programmer_humor in Rebase Supremacy

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.

Atemu , 4 months ago to programmer_humor in Rebase Supremacy

…or you simply rebase the subset of commits of your branch onto the rewritten branch. That’s like 10 simple button presses in magit.

Atemu , 4 months ago to programmer_humor in Rebase Supremacy

Because when debugging, you typically don’t care about the details of wip, some more stuff, Merge remote-tracking branch ‘origin/master’, almost working, Merge remote-tracking branch ‘origin/master’, fix some tests etc. and would rather follow logical steps being taken in order with descriptive messages such as component: refactor xyz in preparation for feature, component: add do_foo(), component: implement feature using do_foo() etc.

Atemu , 4 months ago to programmer_humor in Rebase Supremacy

For merge you end up with this nonsense of mixed commits and merge commits like A->D->B->B’->E->F->C->C’ where the ones with the apostrophe are merge commits.

Your notation does not make sense. You’re representing a multi-dimensional thing in one dimension. Of course it’s a mess if you do that.

Your example is also missing a crucial fact required when reasoning about merges: The merge base.
Typically a branch is “branched off” from some commit M. D’s and A’s parent would be M (though there could be any amount of commits between A and M). Since A is “on the main branch”, you can conclude that D is part of a “patch branch”. It’s quite clear if you don’t omit this fact.

I also don’t understand why your example would have multiple merges.

Here’s my example of a main branch with a patch branch; in 2D because merges can’t properly be represented in one dimension:

<span style="color:#323232;">M - A - B - C - C'
</span><span style="color:#323232;">             /
</span><span style="color:#323232;">    D - E - F
</span>

The final code ought to look the same, but now if you’re debugging you can’t separate the feature patch from the main path code to see which part was at fault.

If you use a feature branch workflow and your main branch is merged into, you typically want to use first-parent bisects. They’re much faster too.

Atemu , 4 months ago to programmer_humor in Rebase Supremacy

Merge is not the issue here, rebase would do the same.

Atemu , 4 months ago to pcgaming in Intel XeSS 1.3 accelerates into the next generation of AI upscaling – Intel Gaming Access

Waitwaitwaitwaitwait, haha Intel did us dirty again. There is no performance improvement whatsoever, they just lowered the internal resolution. The 10% “performance improvement” is simply the difference between 2.0x and 2.3x upscaling. Malicious fuckers.

There may be a quality improvement but that cannot be determined by anyone affiliated with Intel as they’re clearly using every opportunity to lie about this. WTF?

Atemu , 4 months ago to nostupidquestions in if the bird flu started spreading between humans, how long would you need to stay quarantined before it was safe to come out??

No, they’ve got the same information as us. That’s why they explicitly say:

when Covid pandemic lockdowns and social distancing appeared to have halted circulation

It is still speculation, not data.

I’d tend to agree with the speculation but it’s still speculation.

Atemu , 4 months ago to nostupidquestions in if the bird flu started spreading between humans, how long would you need to stay quarantined before it was safe to come out??

I consider those measures to be included in “lockdown” but it’s besides the point: The paper contains no evidence that those measures made it disappear, just that it disappeared.

Atemu , 4 months ago to linux in Will antivirus be more significant on Linux desktop after this xz-util backdoor?

Sorta.

You still need to trust a full Linux kernel and x86 hardware system.

Atemu , 4 months ago to nostupidquestions in if the bird flu started spreading between humans, how long would you need to stay quarantined before it was safe to come out??

That article is interesting and important but it does not show any causal links between lockdowns and the disappearance.

It is, for example, also possible that it was merely displaced by SARS-CoV2.

Atemu , 5 months ago to linux in Help! Random 1-2 second freezes

The only important instance I know of would be your audio server (pipewire, pulse) which could also explain why audio continues to work.

how do I disable rtkit? It seems to just start up regardless of what I do.

Masking the service should do it.

Atemu , 5 months ago to asklemmy in How do you manage your headphone cables?

Ah, indeed. No idea why it didn’t work yesterday.

Atemu , 5 months ago to asklemmy in How do you manage your headphone cables?

Link already died?

Atemu , 5 months ago to linux in Help! Random 1-2 second freezes

Just a hunch but I’d look into rtkit. A bad process with realtime priority could starve out others.

Temporarily disable rtkit and log out.

Atemu , 5 months ago to linux in Good NAS Software for a Bad PC?

Pretty much any?

Headless distros won’t really differ in RAM usage. The only generic OS property that I could relistically see saving significant resources in this regard would be 32bit but that’s… eh.

What’s more important is how you utilize the limited resources. If you have to resort to containers for everything and run 50 instences of postgres, redis etc. because the distro doesn’t ship the software you want to run natively, that won’t work.

For NAS purposes and a few web services though, even containers would likely work just fine.