Nov. 12th, 2015

venta: (Default)

Tell me, o LJ, what are you wearing today?

I have on grey skinny jeans, grey boots, and a fluffy black and white jumper with a panda on it. I'm not usually a big fan of the animal jumper, but I think this one manages to be fluffy without being too cutesy. Also, I like pandas. I admire their approach to eye make-up.

I have accessorised with a selection of purple and yellow bruises on both wrists, and a small blue bruise on my forehead. Rapper is not a safe hobby. As usual, I have a silver 'E' pendant round my neck, and silver studs in my ears. I'm wearing a small analogue watch, because my smartwatch is bust at the moment.

On the way to the office I also had on one of those new-fangled lightweight down jackets that seem to be everywhere this winter. In a fashion-item-is-practical shocker, they're bloody great.

venta: (Default)
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

Profile

venta: (Default)
venta

December 2024

S M T W T F S
1234567
891011121314
15161718192021
2223 2425262728
293031    

Most Popular Tags

Style Credit

Expand Cut Tags

No cut tags
Page generated Jun. 5th, 2025 05:22 am
Powered by Dreamwidth Studios
OSZAR »