Dear all,
I am getting started with contributing to rails. The guide1 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