Rails - Jul 2014 - Git branching and migrations

Hi,

Scuse my bad english. I will try to be as clear that I can.

I have a question about Rails migration and git branching model. 

My case:

I develop an API with Rails. I have lot of tables and therefore lot of 
migrations. 

I should create a new feature in my API which will introduce 1 year of 
development. I also should continue to add features to my main product.

I create a branch for my long time development. I have a branch *A* for my 
actual development and branch *B* for the feature.
I add migrations in both branches.

Now I deploy my branch *A* to the production. The migration version in 
branch *A* is higher than version in branch *B*.

When I will merge, the migrations of branch *B* will never be applied since 
their timestamp is older than those of my branch *A*.
Do you know a solution to my case?

Thank you.

-- 
You received this message because you are subscribed to the Google Groups
"Ruby on Rails: Talk" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to
rubyonrails-talk+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To post to this group, send email to
rubyonrails-talk-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To view this discussion on the web visit
https://groups.google.com/d/msgid/rubyonrails-talk/b02351e3-52c8-49c4-b878-e692236ef685%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.