search

jellybob / activo-rails

Activo is a theme for Web-app-theme, Formtastic and Attrtastic. This is a Rails plugin to make it painfully easy to use.
http://dmfrancisco.github.com/activo/
MIT License
42 stars 8 forks source link

activo merges #21

Closed standardtoaster closed 13 years ago

standardtoaster commented 13 years ago

How do you do your activo merges? I'm looking at fixing a couple more of the style issues upstream, specifically relating to formtastic.

Also, he's got his own set of helpers, and it would be nice come up with a way to keep this all in sync, and get better documentation. see https://github.com/dmfrancisco/activo/issues/4

tobsch commented 13 years ago

in the activo2 branch, we've got a script to pull the current version. but you've already opened up a discussion there so we'll see what's happening :)

jellybob commented 13 years ago

Yup, for the original version the way I dealt with Activo merges was to avoid them ;)

Hopefully a combination of @tobsch's rake task and better coordination should keep things in synch more effectively.