sams/linkable — pull request #1 by ProLoser (2012-02-27 12:41:24+00:00)
Title: Fixed the @fixme. Aliased models now have the Alias in fields

If you wanted multiple instances of the same model, you need to alias. This was broken however I needed it for my app so I went ahead and fixed it.

In a somewhat unrelated note: I _thought_ I had actually forked and was using @dereuromark originally, until I realized I was using yours. I was reviewing the [commit tree](https://github.com/ProLoser/linkable/network) and noticed that there are no merges from his into yours, despite your commits.

You may want to look into properly merging other peoples forks so that it does not bludgeon the history. I rely on the commit history to see who has the most merged and up-to-date work, and if anyone else does it helps give them credit to their contributions to your fork. This is because you are essentially submitting all of their changes with your own info tagged onto it.

I'm not sure HOW you're merging in forks right now, but if you're just copy-pasting things you should not be. Instead, go to the person's fork who you need to merge and copy their url, then in your project, simply do `git remote add [alias] [path-to-fork-repo]`. After that you can simply do `git pull [alias]` to merge in their work, and it will be properly reflected in the logs.

I deleted my Joinable behavior since the Linkable behavior is now a fair bit cleaner on 2.0 and had some of the fixes I was struggling to implement on my own behavior.