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

2010-08-26 Thread Konstantin Khomoutov
On Aug 26, 6:20 pm, Pito Salas r...@salas.com wrote: Hmm. But it's a git-users question. Thanks anyway. [...] My understanding is that the -users suffix is used to differentiate this list from the Git list for developers (hosted at vger.kernel.org) which for some reason is named just git and

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

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