venta

In a radical departure from asking people what they're wearing, I would now like to ask for help with git. If you don't understand the question, just be very grateful and move on ;-)

When an incoming git pull suffers a merge failure[*], why, why, does git decide to compound the problem by staging every modified file it can lay its grubby little paws on?

I assumed that if I started typing "why does git stage..." into Google it would auto-complete with all the various phrases distressed people all over the internet have typed in. It does not, and I can't find anyone writing about it. For bonus points, tell me how to stop it doing this - but I'll settle for understanding the rationale behind it!

[*] Which, if the two versions have changed lines anywhere near each other, it will

Does anyone know anything about USB hubs?

( You do? Excellent, click here! )

In newJob, I am encountering the Djanog web framework for the first time. The biggest problem seems, thus far, to be that I can't type Djanog. This makes API calls fail, makes finding stuff online mildly annoying, and makes me look like an idiot in emails.

Bloody Djanog.

So, that time has come. The time when you accept that your mobile phone is not long for this world, and you need to sort out a replacement.

Unfortunately, the phone I want does not exist.

( I want a high-end Android device which is physically small )

Current working plan is to backup all the data from my existing phone, do a factory reset, and hope that'll clear it up enough to let me squeeze a few more months' use out of it while I try to make a decision, and hope some new phones come out.

Once upon a time, there was a dance team that wanted a flyer. A nice, A4, tri-fold flyer. Dr Fiona heroically tackled it. Then she said sod this, Word is a fair bugger, I cannot get the columns to line up nicely on both sides of the paper.

Haha, I thought, I am so very clever, I will use a downloadable tri-fold flyer template from Office Online. And lo, I did, and it was also a fair bugger because it is completely un-customisable. You want three folds? Well, some of it will be bright orange. No other colour is available. Just bright orange.

After an awful lot of fiddling about, I finally had something I was at least not-unhappy with. And then I printed out a trial run, and it turns out the US-centric world of Office Online makes its tri-fold flyer templates for Letter sized paper. Not A4. Which I had not checked. I am, in fact, not so very clever after all. I imagine the template can be tweaked, but then it's back to the original problem of getting columns to line up manually. I haven't even successfully worked out how to get three evenly-spaced columns yet :( I've never liked Word.

Does anyone have... a tri-fold A4 template, a better knowledge of Word than I have, a burning desire to show off their graphic-design skills, or a large bottle of gin[*]?

Any assistance greatly appreciated.

Edit Or, of course, does anyone have a source of Letter paper, a colour/duplex printer that will handle it, and a generic willingness to assist in exchange for cake? (I have never owned a printer, I have no idea if they mostly do Letter...)

[*] Not strictly relevant, but I might stop caring about the flyer...

Aww. When large institutions try to engage with the modern world, it's quite cute.

This morning I rang the doctors' surgery. "Hello," I said, "I want to order a repeat prescription, which I think you now prefer me to do over email. How do I register for this service?"

The receptionist who'd answered ummed and erred for a bit. Then she ahhed. Then she asked me to wait a moment. Then she came back on the line and ummed a bit more, and asked me to hold again.

Eventually she came back on the line and asked: "Do you have a fax number?"

I said no, I didn't. She erred some more. Eventually, she took my phone number so she could call me back to explain the prodecure to me.

She just phoned back. I was braced for a fairly intricate registration process. It turns out that what I have to do is send them an email them stating which prescription I require.

She's now given me the "email number" and I'm all good to go.

On them twitters, people often create their own hash tags on the fly, running words together to create #devastatingnewtags.

Last night, I happened to see something go past with the a tag which I read as "cannot bear sed". Well, having had a bit of a run-in with sed recently, I can get behind that.

It was only some time later that I realised that they were probably reporting "cannot be arsed".

hjalfi thinks this incident means it's too late for me to resume a normal life :(

Yesterday I updated some of my details in my LJ account. Since then, all my comment notification emails have begun arriving in HTML format.

I've checked, and I still have it set to "plain text". I even swapped to HTML format and back to plain text in case it helped.

It didn't.

Does anyone know anything about this? Or, more importantly, how to make it go away?