Hi all, This happens from time to time and I am not sure the right solution:
Working on a rails application, I am merging my branch (where I did some migrations) with your branch (where you did some migrations too). Inevitably there's a conflict with schema.rb. What to do? I can manually fix the merge conflict, but I am still stuck with ActiveRecord::Schema.define(:version => 20100818220632) do Not clear at all what to do with that. Any suggestion or SOP for this not-uncommon case? -- Pito -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
