Git Fast-Forward Merge requires a pull first

Question

I have a remote repo which i have changed the last time i cloned it.

The local Repo also change some of the files in my local repo.

What i would like to do is pu

Answer 1

git does not push the local changes until the server changes has pull and merged with local. so when you going to push the local changes then git prompt to pull (merge) server changes first.

git pull then git push