Word generating conflicts on GIT

I'm using dropbox to hold my git repo, and a开发者_如何转开发mong other things, I have Word documents there.

Strangely, when I try to push a Word document that no one else has pushed (and I know by a fact), it says it's a non linear merge and requires me to pull and manually merge before I can push.

Afaik, that should happen only when someone had pushed the same file I'm trying to update to avoid loosing someone's code, right? what am I missing?

thanks,

---

It doesn't matter which files were or weren't edited. As long as there are some commits upstream which you don't have downstream git will ask you to perform a pull first. When you pull a merge will happen and if there are no conflicts during that then you can push.