My ~/.gitconfig

Moin Moin,

when you’re using git as your scm, you will probably love it’s command line interface. I am using it on a daily basis … heavily. I know that there are some quite good GUI’s (like SourceTree) but I never got really into them. So if you’re interested to make your git-life a little more comfortable, you can check out my (small) .gitconfig:

There are three entries worth mentioning:

  1. always use “git pull — rebase” to avoid unnecessary merge commits

  2. use “_conflictstyle = diff3” for an advanced diff while solving conflicts during merge or rebase. You will see three different parts: your changes, their changes and the merged common ancestors. This gives you full access to all changes and you can choose what has to be merged

  3. check out the awesome alias “lg”. Full power overview what’Äs going on in your repo. Credits go out to my fine colleague Thomas @Thereincarnator.

Cheers

Posted Monday, June 3rd, at 9:29 PM (∞).

My Music at Reverbnation

Andy%20Wenk

Posted Sunday, April 28th, at 10:00 PM (∞).

Hiring: Are u a cool Rails Developer? We are looking for you!

Moin Moin,

actually we are looking for a Rails Developer to extend our team. As you can imagine, we are nice boyz’n girlz and are looking for you. Check out the SinnerSchrader career site here:

http://www.sinnerschrader.com/jobs/softwareentwickler-ruby-on-rails-mw/

If you have any questions don’t hesitate to get in touch with me …

Cheers

Posted Thursday, April 18th, at 12:29 PM (∞).

Installing CouchDB with Erlang R16B is broken - here is a fix

Moin Moin,

I am using homebrew to install all needed software on my Mac (if available). When upgrading homebrew with

you will get the newest Erlang R16B. This is not compatible witrh CouchDB 1.2.1. You have to switch back to Erlang R15B in a specific version. Simply using brew install erlang-15 will not work!

Here is the workaround:

This is taken from an issue here. The important post is from Jan here.

Cheers

Posted Tuesday, April 9th, at 11:01 AM (∞).

[Talk] HH.js - Ruby on Rails Asset Pipeline

Moin Moin,

yesterday I talked about the Ruby on Rails Asset Pipeline at HH.js. The slides are available here, and Rainer Schleevoigt taped the whole talk here.

Additionally you should really also watch Adam Hawkins talk about Ember.js. He showed the main aspects of Ember.js within an awesome live coding session. The video can be found here.

So - have fun watching!

Cheers

Andy

Posted Tuesday, March 19th, at 4:47 PM (∞).

Powered by Tumblr; themed by Adam Lloyd.