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 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 <>
> "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
> Version: GnuPG v1.4.9 (GNU/Linux)
> iD8DBQFMdZ64KGqCc1vIvggRAjuFAJ43MMt6vUmiXnFedjGjf94Sbm73AQCfUXhd
> 6hVM8pVV+a7osWmzcb1V7oI=
> =TV0p

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
To unsubscribe from this group, send email to
For more options, visit this group at

Reply via email to