How to merge trunk conflicts safely in bzr (

Sadly, the openstack community currently uses bzr instead of git. Instead of rebasing, this is the process by which I have to deal with tree conflicts “safely”? bzr branch lp:trunk_project merge_temp_dir cd merge_temp_dir && bzr merge ../your_original_branch vi path_to_the_conflicted_files #and make your merges bzr resolved bzr commit -m “resolving commits.” bzr push –overwrite lp~myusername/path/to/my/branch I [...]

The problem with gtalk conversations

The universal problem-solving technique

1. Find an error message. 2. google that error message in quotes. If 2 fails, google substrings of the error message. Only after several failed iterations of this process should you bug your cool programmer friends. You’ll be glad you did. They’ll be glad you did. And, if you actually needed to ask your cool [...]

“Package lua5.1 was not found in the pkg-config search path” on OSX

So I was trying to install Lua-GD on my macbook pro, but there was no OSX binary. I figure, eh, I can build a package. So then I download the source and do the make dance. After a bit I get to: Package lua5.1 was not found in the pkg-config search path. Perhaps you should [...]

Github Setup Commands

(This is mainly because I keep forgetting them and I don’t want to keep making new repositories to see these steps.) Global setup: Download and install Git, and then… git config –global “MY NAME” git config –global MY@EMAIL.COM Next steps: mkdir cd MY-NEW-REPOSTORY git init touch README git add README git commit -m [...]

How to make wordpress autoupdate work on a debian server

In case you’re seeing a call to action to enter FTP credentials when you attempt to auto-update your wordpress, you just need to log into your server, cd into the blog’s webroot directory, and do this: sudo chown -R www-data . (replace www-data with whomever your apache user is if it’s not www-data.) Yeah, that’s [...]

Boot Camp Woes

Apple is retarded for not putting Bootcamp files on their website downloadable by all.

Java Debian Install

All you need to do to install java on debian is “sudo apt-get install sun-java6-jdk”.

svn: DB_VERSION_MISMATCH: Database environment version mismatch

Of course, this was about 10 hours after where I expected to grab my old repo’s contents…

How to find debian apt-get packages and/or the right source?

Ask Specifically the searchbox partway down the page under “Search package directories”. Yeah, hat’s about it.