Git合并为仅从一个分支更改的几乎所有文件带来冲突

Question

I tried to merge my local branch with our development branch, but git merge gave me conflict for almost all files that were changed in local branch. So I had to resolve conflicts manually. Most of those files were not changed in development.

For example, I get this conflict:

<<<<<<< HEAD
        render json: {:created => 'true'}.to_json, status: :created, location: @user
=======
        render json: {:created => 'true'}.to_json, status: :created, location: @user
>>>>>>> development

Or this one:

<<<<<<< HEAD
        # some new code
=======
>>>>>>> development

Notice that I have no new line in one of the branches.

Someone knows why this happens, and how can I avoid it?

Answer 1

This happens due to some local files has changed and not committed before you pull/checkout from the git repository.

Remove these extra lines from the conflicted files and commit then.

Answer 2

What about line ending? This could be an issue, especially when your devs / you are working on different operating systems.

https://help.github.com/articles/dealing-with-line-endings