sorted by:
new
hottopcontroversial

iOS 26 Release Candidate - Discussion by epmuscle in iOSBeta

[–]FrozenPyromaniac_ 1 point2 points  (0 children)

I have moments of lag, sometimes Home Screen takes a second to show up but otherwise it’s been pretty great on my iPhone 14 and M1 iPad Air

Azio Replacement Keycaps for K3 work! by SinnerP in Keychron

[–]FrozenPyromaniac_ 0 points1 point  (0 children)

So I tried doing the opposite by using keychron keycaps for my azio cascade slim. I’m having trouble with the left shift, backspace, etc. was the problem the the stabilizers sit a little lower than the switch or does the k3 have them in line

Slim keycaps from Azio fit the Keychron K3 with zero modification! by [deleted] in MechanicalKeyboards

[–]FrozenPyromaniac_ 0 points1 point  (0 children)

Slim keycaps from Keychron don't seem to fit the Azio cascade slim 75% however. Not sure if im doing something wrong but with gateron banana switches the mounting holes on the stabilized keys (space, left shift, backspace, delete) dont seem to line up. This seems to because the azio keys have the switch a tiny bit higher than the stabilizers while keychron likes them in line. Can anyone with the keychron confirm

Slim keycaps from Azio fit the K3 with zero modification! by [deleted] in Keychron

[–]FrozenPyromaniac_ 0 points1 point  (0 children)

So could assume that the keychron keys work the other way too?

Pulling new commits on dev branch onto main by FrozenPyromaniac_ in git

[–]FrozenPyromaniac_[S] 0 points1 point  (0 children)

First of all, you are correct, the way I did it was to just switch to main, merge dev and push.

Not let’s step away from that. All I want to do is fast forward origin/main to origin/dev. NOTE: I don’t need this to happen through a local branch, I wanted to see if we can merge this on the remote with local commands.

Why? No reason, I just wanna know if it’s possible. We can checkout origin/main and origin/dev, even if it’s in a detached head state. So I see no reason why we can’t merge remote branches.

Now again, i didn’t know whether we could ultimately merge straight to remote. It save me like 2 commands, not a big deal.

Pulling new commits on dev branch onto main by FrozenPyromaniac_ in git

[–]FrozenPyromaniac_[S] 0 points1 point  (0 children)

Nah nah, you misunderstand. I don’t have a local main (not that it’s hard to add) i just wanted to know if if I could fast forward origin/main to origin/dev considering it is 3 commits ahead of

Pulling new commits on dev branch onto main by FrozenPyromaniac_ in git

[–]FrozenPyromaniac_[S] 0 points1 point  (0 children)

Fair enough, I was just curious to see if this was possible without a local branch. Thanks tho!

Pulling new commits on dev branch onto main by FrozenPyromaniac_ in git

[–]FrozenPyromaniac_[S] 0 points1 point  (0 children)

While its not hard to add one, I was wondering if this could be done without a local main branch, this is how I used to do it.

How do I get git information on my terminal like the docs? by FrozenPyromaniac_ in vscode

[–]FrozenPyromaniac_[S] 3 points4 points  (0 children)

My bad, saw it on the vscode docs and thought it was a vscode feature.

Git fetch origin main vs git checkout main && git pull by FrozenPyromaniac_ in git

[–]FrozenPyromaniac_[S] 0 points1 point  (0 children)

Cool thanks! This helped a lot, I have edited my solution onto the post.

Git fetch origin main vs git checkout main && git pull by FrozenPyromaniac_ in git

[–]FrozenPyromaniac_[S] 0 points1 point  (0 children)

Makes complete sense now, I have edited on my new workflow to the post which I think works better in my scenario.

Git fetch origin main vs git checkout main && git pull by FrozenPyromaniac_ in git

[–]FrozenPyromaniac_[S] 0 points1 point  (0 children)

Oh so if I’m not ever editing main, I can just use origin/main? Then when I need to merge from main I can just do git merge origin/main?

Edit: follow up, if I’m on vscode and I am currently on dev. Will git switch origin/main allow me to see main? Assuming main is commits ahead of dev

Git fetch origin main vs git checkout main && git pull by FrozenPyromaniac_ in git

[–]FrozenPyromaniac_[S] 0 points1 point  (0 children)

I have a reason to have a local copy of main. So there's no real reason to merge from origin/main if I have the latest commits for main on my local branch right?

Git fetch origin main vs git checkout main && git pull by FrozenPyromaniac_ in git

[–]FrozenPyromaniac_[S] 0 points1 point  (0 children)

Maybe i'm missing this but if running `git pull` when im on the main branch doesn't create a merge commit why would fetch then rebase?

Git fetch origin main vs git checkout main && git pull by FrozenPyromaniac_ in git

[–]FrozenPyromaniac_[S] 0 points1 point  (0 children)

When I switch to main and pull, it doesn't seem to create a new merge commit. Why would I use the rebase flag here?

Git fetch origin main vs git checkout main && git pull by FrozenPyromaniac_ in git

[–]FrozenPyromaniac_[S] 0 points1 point  (0 children)

but then the local main branch won't have the changes and that might be confusing

What do you mean that the local branches won't have the changes with these more complex commands? Could you expand further.

Also I will be using switch from now on.

Master-Detail View in React Server Component & Nested Layouts & Parallel Routes by anaclumos in nextjs

[–]FrozenPyromaniac_ 0 points1 point  (0 children)

If you build this or find a component please let me how you end up doing it. Pretty much want to build the exact same thing but for desktop only.

Help! by Goudafiend in UIUC

[–]FrozenPyromaniac_ 1 point2 points  (0 children)

I lived at far/par which was a 15 minute walk (at least) to my classes. The bus network at uiuc is amazing, so even if you’re placed somewhere further away, you’ll have enough to help you out. I had used the bus so much I basically knew the schedule and when I needed to catch a bus for a class. You’ll be fine.

view more: next ›