I got an amazing array of answers to my question, and I thought I would share with you all, the answer I was looking for, care of Nathan Corvino, among others. The initial error, about updating the current branch of a working copy is denied because it will make the index and and work tree inconsistent, and will require a git reset --hard to fix it, is there to prevent you from forcing changes over someone else’s local work.
- Some background: I’ve been an Subversion user for 12 or so years now. I understand the model, I can, with a little patience, get it to dance to my every whim. The model of a centralized bucket of ‘truth’ that I can push changes to from my local working copy is one that clicks with me. My buddy Tim keeps trying to explain the concepts of git, and each time I think I get it a little more, but it’s still pretty intimidating.
- I’ve been thinking about how to get myself off of tumblr, and on to a real Big Kid website. I have been feeling like being on tumblr, although it is very easy, doesn’t quite give the right impression. Hosting personal commentary on feminism and tech along side a bunch of smarmy joke images and porn just didn’t feel right. I had a couple requirements, when looking for a new place to put my words:
- I wanted to write a post about feminism in tech. I wanted to talk about how you, my overwhelmingly male friends and co-workers, can help make my and other women’s lives easier, and how you may be making our lives harder without knowing it. I wrote out a HUGE post, about my credentials as a woman and a software professional, about what I see as the problems that a woman in tech faces, and about what kinds of things you can do to help.
- So, I don’t drink anymore, more or less. I had a couple of whiskey and cokes at a concert last year, and that’s it for the last 2 or 3 years. I’ve got some varied reasons for that, medications, formative experiences as a kid and later as an adult, varying states of mental health, and a general philosophy that I have just as much fun without drinking. Normally this would not be a problem, except I’m a tech professional.