I want to pull from the github master full to update my current working directory. There is a file i've worked on called form.html which exists in my working directory and an older version on the github origin master branch.

```
 git pull origin master

```

When pulling from the master Im asked to resolve conflicts. I do not want to resolve merge conflicts but instead want my file form.html from my local branch to **completely** replace the form.html on the origin master branch (remote)

Whats the best way to achieve this ? thanks