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

2010-08-26 Thread Donovan Bray
The schema.rb is primarily used in the db:test:prepare rake task that bootstraps your :test database when you run rake spec or rake test. You can bootstrap a non test database but I don't recall the command because I don't use it. So if you don't check it in ; and if you clone a project and imm

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

2010-08-26 Thread Pito Salas
Yeah it's a mystery to me: the question about checking in schema.rb is heavily debated and the rails code itself STRONGLY advises to check it in. But I don't know why because what you say makes perfect sense to me too. -- Pito On Thu, Aug 26, 2010 at 10:40 AM, Donovan Bray wrote: > Fwiw I recomm

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

2010-08-26 Thread Donovan Bray
Fwiw I recommend .gitignore'ing the schema.rb. You don't need it checked in its regenerated every migration and it's a magnet for useless conflicts. On Aug 26, 2010, at 7:20 AM, Pito Salas wrote: > Hmm. But it's a git-users question. Thanks anyway. > > On Wed, Aug 25, 2010 at 6:52 PM, Michael

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

2010-08-26 Thread Pito Salas
Hmm. But it's a git-users question. Thanks anyway. On Wed, Aug 25, 2010 at 6:52 PM, Michael P. Soulier wrote: > 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

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

2010-08-25 Thread 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 sc

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

2010-08-25 Thread Pito Salas
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