ruby on rails - Git merge gives conflicts for almost all files changed from only one branch -

i tried merge local branch our development branch, git merge gave me conflict files changed in local branch. had resolve conflicts manually. of files not changed in development.

for example, conflict:

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

or one:

<<<<<<< head         # new code ======= >>>>>>> development 

notice have no new line in 1 of branches.

someone knows why happens, , how can avoid it?

this happens due local files has changed , not committed before pull/checkout git repository.

remove these lines conflicted files , commit then.