The Official Status Thread
-
@Tsaukpaetra said in The Official Status Thread:
Now to see if someone can get physical access to said box....
Even if we can get physical access, we all know the state of the hardware of that box
-
@topspin said in The Official Status Thread:
Status: Fuck, I hate
gitmerge commitsgitHad tasked cow-orker to develop feature X. Came back to look at things, feature X works but he broke a different module down the line, and now the build fails. Check the individual commits and they look fine, don't even seem to touch this. Well, except for one commit which is a merge commit and those are a completely unreadable mess. But it's just the merge, right?
Well, I have no idea what the flying fuck he did, but his "merge" apparently doesn't contain all the changes in the meantime that should be in there. Which is of course impossible to find out because even if you go through said commit you can only see if what it contains makes sense, but not if it's missing anything.It's already in master, unfortunately, so what the hell do I do now? Go through everything with a fine-tooth comb to check if every line that's supposed to be there actually is there? Or reset everything, apply his changes on top, then force push? Both sound like ... unpleasant options.
Fuck, I'll have to make rebasing mandatory.
The problem is that to resolve a merge conflict, the tool must necessarily allow arbitrary changes in merge commit that don't exist in either of the branches being merged. There's no way around it other than somehow separate the merge part and the conflict resolution part into separate commits. The good news is that there's one VCS that does exactly that - Pijul. The bad news is that looking at how that project is going, it won't be production-ready for many years, possibly ever.
-
@topspin If #3 leaders really goes for the 2-3-4, the party base will positively murder them. No joke.
-
@Rhywden said in The Official Status Thread:
@topspin If #3 leaders really goes for the 2-3-4, the party base will positively murder them. No joke.
Absolutely self-destructive, yeah, but I thought the same about the last two terms and look where that got us.
-
Let's see if this helps:
-
Status: Sure, Amazon, this is what I need:
Proof that putting "laboratory" or "scientific" on something more than triples the price tag.
-
@Benjamin-Hall said in The Official Status Thread:
Proof that putting "laboratory" or "scientific" on something more than triples the price tag.
Works amazingly well with "gaming" and "military grade".
-
@Benjamin-Hall: Yeah, but have you ever tasted how delicious a scientifically-blended smoothie tastes?
-
Status: Received a laptop that needs fixing.
Well, that's a new one....
-
status: power is out. This time there's no storm or anything so someone must have hit something.
-
-
@Zerosquare said in The Official Status Thread:
@Tsaukpaetra said in The Official Status Thread:
someone
Yeah. "Someone".
I'm not nosy enough or venturous enough to discover the actual reason. They got is resolved in 20 minutes so I'm not concerned.
-
Status: Apparently in this universe, the Catholic reformation movement started in Constantinople. #europauniversalis
-
@Tsaukpaetra said in The Official Status Thread:
someone must have hit something
You have hit the fuse?
-
status for the second time this year google has decided I can't use my play balance. I might get an iphone out of spite. Does a good stylus exist for them?
-
@DogsB said in The Official Status Thread:
status for the second time this year google has decided I can't use my play balance. I might get an iphone out of spite. Does a good stylus exist for them?
"Your play balance can only be used in Ireland"
Google's locational service knows where I am at all times. I'm pretty sure they could put an ad for me on my mother's phone when I'm trying to fix something for her.
-
@DogsB said in The Official Status Thread:
my play balance
What are you trying to do? I've found I never get enough to really do anything with.
Are you actually transferring money into it? If so, I highly discourage that. Even using fucking PayPal would be more preferred.
-
@Tsaukpaetra said in The Official Status Thread:
@DogsB said in The Official Status Thread:
my play balance
What are you trying to do? I've found I never get enough to really do anything with.
Are you actually transferring money into it?
As a crude money management device I've moved to single use credit cards for online purchases. You can't use them on play because they actually charge the account and refund you to check if its real.
If so, I highly discourage that. Even using fucking PayPal would be more preferred.
Fucking learned that that hard way haven't I.
-
Why would you give Google money in the first place? They already have more than they deserve.
-
@DogsB said in The Official Status Thread:
I might get an iphone out of spite. Does a good stylus exist for them?
-
@Tsaukpaetra said in The Official Status Thread:
laptop that needs fixing.
Hrm. There seems to be creeping filesystem corruption. Time to make an emergency backup, things might be worse than expected....
-
@DogsB said in The Official Status Thread:
single use credit cards for online purchases.
Oh! Like privacy.com?
Haven't tried them, but I hear good things from their paid shills.
-
@Tsaukpaetra said in The Official Status Thread:
Hrm. There seems to be creeping filesystem corruption.
The real question is: dit it happen before you started fixing it, or after?
-
@Zerosquare said in The Official Status Thread:
@Tsaukpaetra said in The Official Status Thread:
Hrm. There seems to be creeping filesystem corruption.
The real question is: dit it happen before you started fixing it, or after?
Definitely before. I was tasked with two things:
- Getting the start button to work again
- Get Excel to run again (it was complaining that there wasn't enough memory to run, despite 4gb of RAM being available)
The first could not be fixed without trashing their user profile, and the second.... No fucking clue. Reinstalled office from a known-good source and it still blew up.
Then I noticed it doing a cuneiform on reboot, then the system registry decided to delete itself.Fun times!
-
@loopback0 said in The Official Status Thread:
@DogsB said in The Official Status Thread:
I might get an iphone out of spite. Does a good stylus exist for them?
I walked into that.
@Tsaukpaetra said in The Official Status Thread:
@DogsB said in The Official Status Thread:
single use credit cards for online purchases.
Oh! Like privacy.com?
Haven't tried them, but I hear good things from their paid shills.
They didn't have a European presence when I needed them so I went for Revolut. Be as secure as you can be but only five times a day. I hit it last black Friday when buying discounted peanut butter on amazon.
-
-
@DogsB said in The Official Status Thread:
They didn't have a European presence when I needed them so I went for Revolut. Be as secure as you can be but only five times a day.
They also do virtual cards that aren't single use that you could use with Play and then terminate (or just set a really low limit on).
-
@Zecc said in The Official Status Thread:
@loopback0 said in The Official Status Thread:
[Apple]
Wrong finger.
That one?
-
@Zerosquare said in The Official Status Thread:
@Tsaukpaetra said in The Official Status Thread:
Hrm. There seems to be creeping filesystem corruption.
The real question is: dit it happen before you started fixing it, or after?
https://www.youtube.com/watch?v=9h2w3kcKo3A
Also Status: Too much workload, so procrastinating by shitposting.
-
@topspin said in The Official Status Thread:
Fuck, I'll have to make rebasing mandatory.
That won't fix your problems either.
The basic issue is that if you've got significant conflicts because people are editing files in incompatible ways (which is an inevitability with projects over a certain size) then you need to be very careful when combining the two sets of changes. Whether you use rebasing or merging, it doesn't change the fact that actually being careful and thoughtful is required. Even if the differencing engine was working on the structure of the code as opposed to the form of it, it'd still be difficult.
The tool for fixing your issues now is a hard reset to wind
master
back to before the offending commit. Before you do that, put some extra branch tags in so that you won't lose any commits until you're absolutely ready to perform the final clean up. Moving branch labels around in git is (comparatively) easy. If there's a lot of stuff downstream of this that also needs to be fixed, this can be painful, but leaving it doesn't make it better. If you're using a Github-style flow (pull requests, etc.) then it might be worth protecting themaster
branch so that commits to it can only happen by accepted PR and then only when the merge or rebase is clean.
-
STATUS looking into getting a new iphone. FIVE weeks for delievery. Still no idea what to buy as a stylus. I doublt my note's stylus will work on it so maybe its back to pen and paper.
-
@DogsB What are you using a stylus for on a phone?
-
@DogsB said in The Official Status Thread:
Still no idea what to buy as a stylus.
I believe @Gąska recommended aluminum can.
-
@loopback0 said in The Official Status Thread:
@DogsB What are you using a stylus for on a phone?
I actually use it to take handwritten notes. The samsung note comes with a built in stylus and I can use it to write faster than I can type on a phone.
-
@DogsB
Adonit make some that are supposed to be good and are fairly cheap, but I've never used one so can't confirm.
-
@DogsB said in The Official Status Thread:
STATUS looking into getting a new iphone. FIVE weeks for delievery.
Ordered Saturday, supposed to be delivered today. (Don't jinx it )
-
STATUS Jesus, task manager in windows 10 is a crock of shit. I couldn't find the rogue java process anywhere. I eventually had to look to tasklist and taskkill to nuke it orbit. Fucking gui tools. Look shiny but non functional.
-
@DogsB said in The Official Status Thread:
STATUS looking into getting a new iphone. FIVE weeks for delievery. Still no idea what to buy as a stylus. I doublt my note's stylus will work on it so maybe its back to pen and paper.
Any capacitive stylus should work, and unless the Note uses some special fancy technology, its stylus should be one
-
@DogsB said in The Official Status Thread:
STATUS Jesus, task manager in windows 10 is a crock of shit. I couldn't find the rogue java process anywhere.
Is the "shit" you're talking about that they renamed "processes" tab to "details" and so you didn't think to click there?
-
@Gąska said in The Official Status Thread:
@DogsB said in The Official Status Thread:
STATUS Jesus, task manager in windows 10 is a crock of shit. I couldn't find the rogue java process anywhere.
Is the "shit" you're talking about that they renamed "processes" tab to "details" and so you didn't think to click there?
Takes 10 seconds to populate. Fucking GUI junk.
-
@topspin “set up your new device using Quick Start.”
That’s… pretty convenient, not gonna lie:Also, newest Safari (or phone screen, who knows) again makes it nearly impossible to scroll the damn side bar, because apparently that closes with a delta-x > 1.
-
@topspin said in The Official Status Thread:
@topspin “set up your new device using Quick Start.”
That’s… pretty convenient, not gonna lie:Whenever I see a picture of a phone, I wonder where the hell the author got a second phone from. In this case, the second phone is on the picture...
-
@Gąska it's phones all the way down.
-
@Gąska said in The Official Status Thread:
Whenever I see a picture of a phone, I wonder where the hell the author got a second phone from. In this case, the second phone is on the picture...
-
@hungrier I don't have to click to know what it is. Have an upvote!
-
Status: just had to ask for clarification that someone’s use of the word “gas” was, in fact, in reference to an actual gas.
-
STATUS finaly got the fucking service to start. I would cry but I'm saving my tears for the next round of frustration.
Thanks for pointing out details @Gąska !
-
@DogsB said in The Official Status Thread:
STATUS finaly got the fucking service to start.
After your last post I wanted to ask whether you're using 's computer. Now I'm even more sure of it.
-
@Gąska said in The Official Status Thread:
@hungrier I don't have to click to know what it is. Have an upvote!
That was not the one I've seen, though the idea is similar.
The one I'm thinking of had a lot more cameras, of different types.
-
@kazitor said in The Official Status Thread:
Status: just had to ask for clarification that someone’s use of the word “gas” was, in fact, in reference to an actual gas.
Gasoline is a liquid at nominal temperature/pressure
Filed under: Had to add the temperature/pressure part to ward off s