![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png){kind=small}
You want more fans, I want more stage
Nov. 12th, 2015 02:13 pmIn 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
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
Hello! I'm back from holiday. It was lovely; more on it later.
For now, though, I have a boring technical enquiry about webpages...
( How shall I set up my bookings form? )
For those who don't do geeky questions, but do like either (a) The Smiths or (b) Snoopy, I recommend this.
For now, though, I have a boring technical enquiry about webpages...
( How shall I set up my bookings form? )
For those who don't do geeky questions, but do like either (a) The Smiths or (b) Snoopy, I recommend this.
A brief request: does anyone have any recommendations for an Android twitter app? Must be able to handle multiple accounts.
Beyond that, I've never used twitter other than on t'web or via sms, so don't really know what I want.
Beyond that, I've never used twitter other than on t'web or via sms, so don't really know what I want.
We learn to toe the party line
Feb. 18th, 2011 02:40 pmToday seems to be poll day.
[Poll #1706506]
If you don't know what I'm talking about, it's really not that exciting.
In other news, did you know that tarragon was also known as dragon's wort, or the dragon herb? Which is cool. I still don't like it, though.
[Poll #1706506]
If you don't know what I'm talking about, it's really not that exciting.
In other news, did you know that tarragon was also known as dragon's wort, or the dragon herb? Which is cool. I still don't like it, though.
Numpty CSS question
Jan. 24th, 2011 09:44 pmApologies for any stupidity of question... me and CSS still don't get on.
I have defined myself two nice <div>elephants elements, each of which will take up about half the screen.
Now I just need to persuade my stylesheet to help me put them next to each other rather than one below the other.
The ideal answer will not involve tables :) Does anyone know what I should be looking at doing?
I have defined myself two nice <div>
Now I just need to persuade my stylesheet to help me put them next to each other rather than one below the other.
The ideal answer will not involve tables :) Does anyone know what I should be looking at doing?
Help me, interwebs, you're my only hope...
( Microsoft Update broke my .NET code... )
Update: ( Solved )
( Microsoft Update broke my .NET code... )
Update: ( Solved )
An question about web forms and security...
When filling in forms (I use FireFox), it's often possible to hit the down arrow and get a list of things you previously typed into that field. This is kind of handy, mostly, and results in me not having to type my name or email address out a lot.
Forms taking things like credit card details don't usually do this - for obvious reasons - and I assume the existence of some sort of 'nocache' attribute which the form-writer can set on the fields which contain information which should be a little more secure.
Except today I filled in an entire payment form (card number, expiry date, security code, the lot) from cached information based on me having filled the same form out on that website months ago. This strikes me as Not Good.
I intend to write to the site in question and tell them I think they're a bit rubbish... but I'd like to be sure I know what I'm talking about first. Am I right about the form attribute ? Am I totally wrong, and this is something which FireFox implements wrongly and the site itself can't be blamed for ?
Informed opinion welcome :)
When filling in forms (I use FireFox), it's often possible to hit the down arrow and get a list of things you previously typed into that field. This is kind of handy, mostly, and results in me not having to type my name or email address out a lot.
Forms taking things like credit card details don't usually do this - for obvious reasons - and I assume the existence of some sort of 'nocache' attribute which the form-writer can set on the fields which contain information which should be a little more secure.
Except today I filled in an entire payment form (card number, expiry date, security code, the lot) from cached information based on me having filled the same form out on that website months ago. This strikes me as Not Good.
I intend to write to the site in question and tell them I think they're a bit rubbish... but I'd like to be sure I know what I'm talking about first. Am I right about the form attribute ? Am I totally wrong, and this is something which FireFox implements wrongly and the site itself can't be blamed for ?
Informed opinion welcome :)
Who stole my keyboard?
Nov. 5th, 2008 09:33 amHmm. If I go to the BBC's US Election Map (and who hasn't, this morning?) and click on a state, my browser stops responding to keyboard shortcuts. Why would that be ? (I'm using Firefox 3)
I presume whatever cleverness is used to render the map is trapping keyboard events, but I've no idea why it would do that.
I presume whatever cleverness is used to render the map is trapping keyboard events, but I've no idea why it would do that.
