Merge carefree
Merging run into conflicts?
### First do a commit of your changes
```
git add *
git commit -a -m "local file server commit message"
```
### Then fetch the changes and overwrite if there is a conflict
```
git fetch origin master
git merge -s recursive -X theirs origin/master
```
I found this often very helpful [solution on Stackoverflow](https://stackoverflow.com/a/10113231 "solution on Stackoverflow").
