Rails core - Sep 2011 - Pulling patches of other people for examination results in conflicts

Dear all,

I am getting started with contributing to rails. The guide[1] says that to
examine someone else''s pull request, I should git pull their topic
branch
into one of my local topic branches. I do following and get a large number
of conflicts.

[master]$ git checkout -b testing_patch

[testing_patch]$ git pull some_git_remote remote_topic_branch

From git://github.com/some_git_user/rails
 * branch            remote_topc_branch -> FETCH_HEAD
Auto-merging Gemfile
CONFLICT (content): Merge conflict in Gemfile
Auto-merging RAILS_VERSION
CONFLICT (content): Merge conflict in RAILS_VERSION
Auto-merging README.rdoc
CONFLICT (content): Merge conflict in README.rdoc
Auto-merging Rakefile
CONFLICT (content): Merge conflict in Rakefile

How do I avoid above?

Thanks

[1]:
http://guides.rubyonrails.org/contributing_to_ruby_on_rails.html#testing-patches

-- 
Waseem
Blog: http://babygnu.blogspot.com
Twitter: http://twitter.com/_waseem

-- 
You received this message because you are subscribed to the Google Groups
"Ruby on Rails: Core" group.
To post to this group, send email to rubyonrails-core@googlegroups.com.
To unsubscribe from this group, send email to
rubyonrails-core+unsubscribe@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/rubyonrails-core?hl=en.