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

About the conflicts you can see on a git pull, see "How do I resolve a conflict after git pull?".
You can solve a merge conflict manually.

If your git opens vim, check your mergetool settings: "My git mergetool open 4(not 3) windows in vimdiff".

Once all conflicts (triggered by the git pull) are resolved, added and committed, then you can git push.
This will add new commits to the remote repo history, making the push result in a fast-foward merge on the remote side.