Git: refusing to merge unrelated histories

Most recently, I found the following error during a git operation:

 
   $ git pull
   fatal: refusing to merge unrelated histories

which led me to a hunt. I found out that since version 2.9.0, git has removed the ability to merge branches with unrelated histories (thanks for the obvious message Git). This change (and many others) can be found here.

Update on my Gitconfig

Here is another update on my gitconfig:

My Git Configuration

I have configured Git locally in many places now and I thought of placing a copy of my personal choice (my .gitconfig file).  Perhaps this will help me setup my personal environment everywhere I'm using it. I should put this on github at some point. A few things to notice:

1. I prefer p4merge for merge tool. It's simply awesome, worth to try if you haven't yet.
2. Vim as my editor. Yes, I don't use emacs.
3. Yes, I code on a Mac!

My .gitconfig as follows:

Spring Roo: Persistence Setup

I've found Spring Roo to be a great way to learn how to setup configuration properly.  As I continue to spend time in configuring my home project, I continue to be amazed at the powerful features that Roo brings to the table. I had written a small application for tracking family chores. I spent about 25 minutes drawing the entities in a napkin, then spent 10 minutes writing a Roo script (file with extension "roo"). Then, I opened a Roo shell and run "script myscript.roo". This created my project, including all the scaffolding for my entities.  I had my project running in minutes. After a while, I detected a problem with my entities relationship and wanted to see the persisted data. Of course, I had the the "IN MEMORY" choice, which brought all sort of problems when trying to see the data within.