Re: [git-users] What to do when you get a conflict (rails) of schema.rb

[Michael P. Soulier]

On 25/08/10 Pito Salas said:

 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

This is not a Git question.

Mike
-- 
Michael P. Soulier msoul...@digitaltorque.ca
Any intelligent fool can make things bigger and more complex... It takes a
touch of genius - and a lot of courage to move in the opposite direction.
--Albert Einstein


signature.asc
Description: Digital signature

[git-users] Re: What to do when you get a conflict (rails) of schema.rb

[Konstantin Khomoutov]

On Aug 26, 1:51 am, Pito Salas r...@salas.com wrote:

 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.

I don't know anything about this stuff but the words rails and
schema bring back memories about this discussion [1], -- check it
out (especially the last message in it) as it might be relevant.

1. 
http://groups.google.com/group/git-users/browse_thread/thread/6bcec737e3617956

-- 
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 git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.