The Official Status Thread
-
@Maciejasjmj said in The Official Status Thread:
@Magus said in The Official Status Thread:
In Git
- Commit your changes to local branch
- Sync with remote tracking branch
- Resolve conflicts, commit merge and resync if needed.
To make a complicated list of steps look easy:
- Start with a simple step
- Add a second simple step
- Add a third, complicated step, plus another and a few vague instructions if you want
-
@Maciejasjmj no, literally every single time, it does that. Either it says you have uncomitted changes, or that it just can't do it if there are conflicts. It's completely terrible.
-
@Jaloopa said in The Official Status Thread:
To make a complicated list of steps look easy:
It's pretty much the same workflow as in TFS (the single difference being that the merge is a separate commit, which I think it isn't in TFS). So if TFS has three steps, so does Git.
-
@Magus said in The Official Status Thread:
Either it says you have uncomitted changes, or that it just can't do it if there are conflicts.
You do commit your changes to your local repository before attempting to sync, right?
-
Status: Found out that making a VM with 16GB of ram allocate a 16GB reserved unswappable kernel memory buffer means it won't do much of anything anymore.
Should've seen that coming.
-
@Maciejasjmj said in The Official Status Thread:
So if TFS has three steps, so does Git.
@Maciejasjmj said in The Official Status Thread:
You do commit your changes to your local repository before attempting to sync, right?
Where does TFS have such a step?
But hey, let's call @magus an idiot instead of acknowledging that git works differently from a casual user's PoV than TFS.
-
@aliceif said in The Official Status Thread:
let's call @magus an idiot
Isn't that our standard operating procedure?
-
@Luhmann since Blakeyrat left, yeah
-
Status: Shadowverse is cool. It's Japanese hearthstone, and therefore oft referred to as waifustone. It's got a nice dark theme, and well differentiated classes. The first steam guide shows how to get the Japanese voices, as well as undo the mild censorship (cleavages, man!), pretty much as expected.
Anyway it's ac okay game, I say.
-
@aliceif said in The Official Status Thread:
git works differently from a casual user's PoV than TFS.
I'll admit that git has a much steeper learning curve than TFS. Learning to use TFS took about 5 minutes. Learning to use Git took me... Well, I'm still not sure I know how to use Git, despite using it every day! But the subset of Git I know how to use is way less painful than TFS was. I don't regret switching for a moment.
@aliceif said in The Official Status Thread:
let's call @magus an idiot instead of acknowledging
:why_not_both?:
-
Status: Considering ripping out socket.io and using raw websockets. At this point it's causing roughly as many problems as it's solving, and working around those problems is leading toward some really ugly inner-platform effect.
-
@Magus said in The Official Status Thread:
In Git, when it's time to check in, it normally looks like this:
Commit your changes locally.
Change branches to local master.
Sync remote master to local master.
Change branches to your branch.
Attempt to sync from local master to your branch.
git pull --rebase origin master
There were conflicts, so it won't happen at all,and you have to do it on command linegit mergetool
so that VS will finally let you merge.
Resolve your conflicts.
Check in.I hate git.
I removed three unnecessary steps. You're welcome.
Also, you should define VS, or P4Merge, or something similar as your mergetool.
-
@coldandtired Just finished it last night
-
Status: Slept horribly. Contemplating what would happen if I snorted espresso.
-
@Polygeekery Pneumonia.
-
@JazzyJosh That sounds like a wager.
-
@Polygeekery sounds more fun than the Cinnamon Challenge
-
Status: well, crap, my wallet has gone walkabout
-
Back to the dark side *sigh*
Having worked on the new and shiny for just long enough to get used to it and know what I'm missing, I'm back on the existing/legacy product for this sprint at least. Admittedly one of the things I'm tasked with is the newest and shiniest part of this mess, but I've also got to "unit test" another guy's project.I took that on last sprint because he was over-committed and when I asked if I could take any of it on that was what he puled out. Didn't even get to start it because he didn't finish the thing I need to test. This sprint he's got a pretty light workload but he still wants me to test his work for him.
And I have to help update the micro-design documentation - I've complained about that before - for a piece of work I had no involvement with using technology I know nothing about.
Right now I'm just waiting for a folder to unzip itself. If at all possible I have to do a bunch of other stuff today, after it's finished. Its current estimate is nearly three hours remaining. It's less than an hour and a half before I have to leave.
-
@aliceif said in The Official Status Thread:
But hey, let's call @magus an idiot instead of acknowledging that git works differently from a casual user's PoV than TFS.
Why, is @magus running git on Windows 10?
-
@Polygeekery said in The Official Status Thread:
Contemplating what would happen if I snorted espresso.
As long as you can snort at 145PSI, you'll be fine.
-
@Lorne-Kates Worse, I would be and they won't let me :D
-
@Lorne-Kates said in The Official Status Thread:
@aliceif said in The Official Status Thread:
But hey, let's call @magus an idiot instead of acknowledging that git works differently from a casual user's PoV than TFS.
Why, is @magus running git on Windows 10?
This is one case where we'd both be in agreement calling him an idiot
-
@Polygeekery said in The Official Status Thread:
Status: Slept horribly. Contemplating what would happen if I snorted espresso.
apparently so did I? All I know is I woke up half an hour late to work (now) and panic doesn't have eenough energy to for me succeed starting normal init procedural
-
Status: Dudes, I lay down before you an item of sublime radness:
-
Status: So I got the contract position back to my previous job for proper "knowledge transfer". It's been two weeks and much headache, but they finally said, "Yup, you're good to go! You can start working now."
Of course, they couldn't just reactivate my existing account. Nooo, that would be TOO EASY.
So, per company policy, I now (apparently) have an email address of Tsaukpaetra.1@companyname.com, but because I'm not there nobody's figured out how to tell me my password so I can get access.Not only that, but I seem to have an approval pending (i.e. I have to approve something, for some reason) for a RSA digital token so I can log into the Citrix gateway and access my VM (which hasn't been provisioned or set up at all).
I have to wonder: How should I track hours spent days doing nothing but waiting? Should I log it? I've been very morally careful so far, only logging in interaction times, but I'm getting a little miffed.
Thoughts?
-
@Tsaukpaetra said in The Official Status Thread:
Status: So I got the contract position back to my previous job for proper "knowledge transfer"
Ah, the sweet "we gone done and fucked up" fee.
I have to wonder: How should I track hours spent days doing nothing but waiting? Should I log it?
Every minute of it. You're a contractor now. You work by the hour. If you're there, you're billing.
After the first period of "T-man was just sitting around doing nothing while we shat on our thumbs", they might get their act together.
-
@Lorne-Kates said in The Official Status Thread:
If you're there, you're billing.
That's the conundrum. I'm remote, so...
I'm essentially at my new place pretending to be "on call" with the previous place.
-
@Tsaukpaetra said in The Official Status Thread:
@Lorne-Kates said in The Official Status Thread:
If you're there, you're billing.
That's the conundrum. I'm remote, so...
I'm essentially at my new place pretending to be "on call" with the previous place.
It's called "getting paid twice".
If you're on call, then there's an hourly rate for that.
Go to any other professional. Tell them you want them on call, but won't pay them for that. See how it works out.
-
@Lorne-Kates said in The Official Status Thread:
@Tsaukpaetra said in The Official Status Thread:
@Lorne-Kates said in The Official Status Thread:
If you're there, you're billing.
That's the conundrum. I'm remote, so...
I'm essentially at my new place pretending to be "on call" with the previous place.
It's called "getting paid twice".
If you're on call, then there's an hourly rate for that.
Go to any other professional. Tell them you want them on call, but won't pay them for that. See how it works out.
I can accept that.
Fun fact: Very little is currently negotiated to my knowledge of my working hours anyways, so I'm not even sure what they expect it to be.
I mean, coming from salaried to contract? I'm out of my depth here.
I don't expect to actually do full 8-hours-a-day work, but since I'm technically available during that time...
Ech, this is making my head hurt. :/
-
@Jaloopa said in The Official Status Thread:
@Polygeekery sounds more fun than the Cinnamon Challenge
Fun fact, I actually passed the Cinnamon Challenge. I had never heard of it, and a roommate dared me to down a spoonful of cinnamon. I was expecting it to be terribly spicy or strong-flavored or something like that. I ate a spoonful but nothing happened. He was floundered and said "That wasn't supposed to happen." Then I forgot about it, until months later when I saw a Cinnamon Challenge montage on YouTube and decided that most people are idiots who don't know how to eat.
-
@mott555 said in The Official Status Thread:
@Jaloopa said in The Official Status Thread:
@Polygeekery sounds more fun than the Cinnamon Challenge
Fun fact, I actually passed the Cinnamon Challenge. I had never heard of it, and a roommate dared me to down a spoonful of cinnamon. I did, and nothing unusual happened. He was floundered and said "That wasn't supposed to happen." Then I forgot about it, until months later when I saw a Cinnamon Challenge montage on YouTube and decided that most people are idiots who don't know how to eat.
Well obviously you inhale your food before swallowing, right?
-
@Magus another remake? The art is marginally better than the Entertainment Pack version, though.
-
@Arantor This is an official release by the original maker. I miss the sprites from the entertainment pack, though, those are what I grew up with :(
-
Status: why, Microsoft? Your
fn
button doesn't help at ALL
-
@Tsaukpaetra said in The Official Status Thread:
@Magus said in The Official Status Thread:
I can't imagine TFS having a problem with unreal though...
Yeah, they wouldn't tell me and it was before my time.
They're also checking in binary blobs from
bin
andobj
folders by default (the whole perforce datastore is nearly filling the 1tb drive attached to it).Teach the admins about 'p4 obliterate'
-
@dcon said in The Official Status Thread:
@Tsaukpaetra said in The Official Status Thread:
@Magus said in The Official Status Thread:
I can't imagine TFS having a problem with unreal though...
Yeah, they wouldn't tell me and it was before my time.
They're also checking in binary blobs from
bin
andobj
folders by default (the whole perforce datastore is nearly filling the 1tb drive attached to it).Teach the admins about 'p4 obliterate'
I'll have to find out who they are first. Nobody even has passwords here.
-
status Fuck you Realtek. Just Fuck You.
Since getting a new (expensive) set of headphones (Bose QuietComfort 25), my go-home routine became:
- remove headphones from computer
- click mute (to not annoy open-office-roommates)
- home
Next day: - unclick mute
- plug in headphones.
No sound. Reboot. Ok.
Found the work-around.
- Open "Realtek HD Audio Manager"
- move volume slider all the way to max, all the way back to 0, and back to where you want. (and, no, doing that in the regular volume control does not work)
- Sound!
Realtek. Just. Fuck. You.
-
@dcon You must not have any audiophile friends.
I once mentioned thinking of buying a bose thing, and they insisted Buy Other Sound Equipment should be avoided.
-
@Magus said in The Official Status Thread:
@dcon You must not have any audiophile friends.
I once mentioned thinking of buying a bose thing, and they insisted Buy Other Sound Equipment should be avoided.
I wasn't going for audiophile. I want the noise cancellation. Open office space. (A co-worker is always going on about bose is the best for noise cancellation - so I did)
edit: oh, and comfort on the ear - these ones I actually can wear for hours.
-
@dcon I think their greatest talent is getting a few people to rave about them.
-
@Magus fairly sure you're thinking of Beats by Dre at this point?
-
@Arantor There are plenty of people who would put them in the same category.
-
@dcon said in The Official Status Thread:
status Fuck you Realtek. Just Fuck You.
Since getting a new (expensive) set of headphones (Bose QuietComfort 25), my go-home routine became:
- remove headphones from computer
- click mute (to not annoy open-office-roommates)
- home
Next day: - unclick mute
- plug in headphones.
No sound. Reboot. Ok.
Found the work-around.
- Open "Realtek HD Audio Manager"
- move volume slider all the way to max, all the way back to 0, and back to where you want. (and, no, doing that in the regular volume control does not work)
- Sound!
Realtek. Just. Fuck. You.
Whenever someone mentions Realtek, I have to do this.
-
@sloosecannon said in The Official Status Thread:
Whenever someone mentions Realtek, I have to do this.
Yeah. But when getting a laptop, the only choice is to not get that laptop.
-
@dcon said in The Official Status Thread:
@sloosecannon said in The Official Status Thread:
Whenever someone mentions Realtek, I have to do this.
Yeah. But when getting a laptop, the only choice is to not get that laptop.
Oh yea totally. They have total market domination.
-
Status: Oh JIRA, you make me laugh sometimes...
From the nice display:
Looks fine, numbers probably don't add up though based on individual worklogs.
Actually, this is a snip of the raw data from an API request for that ticket:"timetracking":{"remainingEstimate":"4h 12m","timeSpent":"1d 2h 33m","remainingEstimateSeconds":15120,"timeSpentSeconds":37980}
Correct my logic, but isn't 37980 seconds more like 10.55 hours??? That's the correct number I think.
My first guess is that deleting worklog entries doesn't affect the calculation of the logged work nice display, but then I just did this with another issue and it seemed to work fine. :/
Whatever....
-
@Tsaukpaetra 10.55 h = 8h (1d) + 2h 33m. WOMM.
-
@izzion said in The Official Status Thread:
8h (1d)
Oh right.
I forgot about that wackiness...
Edit: Slapped in a helper class to deal with this based on a (gasp) SO answer:
-
Status: updated A-RANT-or thread. Wondering if relationships are as complicated as they seem to be about to be getting.