Log in

No account? Create an account

September 14th, 2012

Okay, the week managed to end pretty badly. Things were looking pretty good yesterday, but none of it got finished today. One effort was completed, but it was done in a branch, and when I went to merge it into the main branch, things went very wrong. There were a lot of unexpected conflicts, mainly files that were deleted in both branches - how is that a conflict? I want to delete it, they want to delete it... just delete the damn thing! When I'd finally resolved that and committed the changes from the trunk to the branch, I went to merge the branch changes back to the trunk, and it gave me an error that nobody I talked to had ever heard of about filesystem versions. In the end, I decided that since only about four files had changed in any way, it would be easier to grab copies of those files, stick them in the trunk, and commit that, abandoning the branch entirely. Unfortunately, I didn't reach that conclusion until well after my time to leave, so I ended up staying a bit late. It's comp time, but considering how much of a pain it's been to arrange for this week off, I don't expect I'll be taking much time off in the near future. I still have nearly two weeks of leave I need to take by the end of the year. I know I complain about things that most people would love, but it's annoying having to take time off when there's so much to do. It's probably a good time, though, as management is eroding the structure I've tried to create as the deadline draws closer. I almost want something to go wrong as a result so I can point out WHY I put that structure in place, but I also want the project to succeed. It's a weird moral conflict.

Latest Month

April 2019


Yes, I'm THAT Nidoking. Sometimes I write fanfiction... often I waste all my time playing video games and watching anime. But it's not a waste if I enjoy it, right? I can quote from a movie, video game, anime series, or British comedy apropos of just about any situation, and one of my main goals in life is to entertain people. (The other big one is amassing as much anime and manga as I can... see below for a progress report.) That's me in a nutshell. ("Help! I'm trapped in a nutshell! What a bloody great nutshell this is!")
Powered by LiveJournal.com