My Head Explodes!

I wonder why SVN has been made so totally unintuitive and hard to use. Sure, it might be handling my versions, but it's hardly increased my productivity.

"What's wrong this time?" I hear you ask. Let me tell you. I've heard people complaining about some kind of nightmare when merging two branches together. Well. I can't do it, as in I am unable to do it. My skillset is not complete enough for that particular task. I can has stupidz syndreom! Perhaps I need to participate in a course on SVN and finally get a diploma with silver edges and nice italics to be allowed to use SVN, but then it definitely isn't for me.

"Merge branch1 into branch2." That's what I want to do. But, what does SVN? I have no. fucking. clue. It spat out a lot of text, finished, and I have my local files all fucked up. I'm not sure what (if anything) it did to the repository. I finally got the right files back from the repository. So, I tried another way. I get some checksum errors, and most probably my repository is totally fucked up.

While writing the code for LightFrame indeed is dull, boring and even frustrating at times, fighting with problems like these just don't help the matter. I fight with the code, not with the maintenance of said code.

Update: I virtually redid what I did the first time around. Now everything seems to be working just as intended.... *kaboof*

Update2: Nope. Close, but no cigar. *kablam*

Update3: Ok. I give up. I seem to have just deleted the whole trunk, when I just tried to reorganize it. fuck this. I'm doing my own backups...

Update4: Seems like I fixed it and Subclipse is not to thank for that one... I just copied over the template branch to the trunk, and now I have stuff in my trunk. *sigh* Where's that diploma...