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 <donno...@gmail.com> wrote: > 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 <r...@salas.com> wrote: > >> Hmm. But it's a git-users question. Thanks anyway. >> >> On Wed, Aug 25, 2010 at 6:52 PM, Michael P. Soulier >> <msoul...@digitaltorque.ca> 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 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 >>> >>> -----BEGIN PGP SIGNATURE----- >>> Version: GnuPG v1.4.9 (GNU/Linux) >>> >>> iD8DBQFMdZ64KGqCc1vIvggRAjuFAJ43MMt6vUmiXnFedjGjf94Sbm73AQCfUXhd >>> 6hVM8pVV+a7osWmzcb1V7oI= >>> =TV0p >>> -----END PGP SIGNATURE----- >>> >>> >> >> -- >> 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. >> > > -- > 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. > > -- 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.
