Git Commands

List Branches

git branch

List Remote Branches

git branch -r

Push to remote server

git push origin [branch_name]

New Branch

git checkout -b [branch_name]

Merge Branch with master

Ubuntu 11.10 - The original

I thought I'd try the non-kde version of Ubuntu - aka the original - and I installed it on my laptop.

Install went extremely well and after a couple of hours I think I'm used to the desktop - at least familiar enough with it that it's not making me feel like a stranger anymore. It seems like it is a good time to change over as this version doesn't have the bugs that have been introduced into KDE over the last few iterations. It also has a great software center, and my favorite of all Ubuntu One.

Don't hide because of a tragedy

My small community has recently been hit hard by the deaths of several young people. The most recent of which was a homicide. This has been especially tough on the community as it is a very close and safe place to be.

Kubuntu 11.10 Upgrade Kmail won't start

I upgraded some of my Kubuntu systems to the newest version (Oneric Ocelot) and for the most part it went ok.

The biggest issue was the conversion of Kmail to Kmail2 and its use of Akonadi for its data store. The first time I started Kontact after the upgrade it asked if I wanted to migrate my data, I said yes and it promptly failed. This also happened on another system where I said no.

Now Kmail/Kontact won't start. Fortunately my mail setup is all IMAP so no mail is stored locally, and I've never been good at tracking my contacts.

More Rails Minutiae

Here's some more testing and model bits that took a while to track down.

For ENUM equivalents

Rspec

it { should ensure_inclusion_of(:taste).in_range(%w{family spicy adventurous plain})

Model

validate :taste, :inclusion => { :in => %w(family spicy adventurous plain) }

does not work, need to use

Syndicate content