How to perform PULL while keeping HEAD changes?

Question

Navigation

#1 by (1 votes)

0

Some changes were made, committed, and conflicting in some files. If you did not% done%, it would solve as follows:

git stash
git pull
git stash pop

But with commits done, how can a commits be made while keeping git pull changes in these conflicts?

git

asked by anonymous 22.06.2017 / 14:32

1 answer

score 1 · Accepted Answer

I want an automated way, since in this case all conflicts will be kept by the local version and discarded the origin

Use

$ git pull -s ours

This will resolve conflicts by always giving priority to the local version.