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

Type:

git pull

to fetch the remote changes, and merge them with your changes. Resolve any conflicts which arise, and then type

git push

to send your local changes (plus the new merge commits) back upstream.