Why does git continue to give me a merge message?

Question

I am wondering why git keeps giving me a merge message.

• I have nothing to drain.
• I already cleared all my stamps with git stash clear
• Also, before doing this git pull, I ran git status:

Can someone tell me how to resolve this?

Answer 1

I assume that you are doing this on a production server, and your deployment workflow consists of pull and deploy.

, - , , - , . , , .

reset .

git reset --hard origin/master

, , git, , .

---

--ff-only, , .

git pull --ff-only

Answer 2

git pull git fetch + git merge, , , .

, - , , , .