Marown/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2024-07-04 19:46:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add documentation on how to pull without conflicts

Browse Source 
Per #255
This commit is contained in:
Addison 2017-03-06 19:37:56 -06:00 committed by GitHub
parent ac33a449af
commit 56392a2220
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
readme.md
View File

@ -168,6 +168,20 @@ final hosts file.
The `whitelist` is not tracked by git, so any changes you make won't be
overridden when you `git pull` this repo from `origin` in the future.
### How do I pull this repo without losing changes?
The easiest way to update this repo without overriding the `whitelist`,
`blacklist`, or `myhosts` files is to run the following commands. Any changes
to these files will be placed into a stash so that you can pop after the
updated repo is pulled.
```bash
git checkout -- hosts readmeData.json
git stash
git pull
git stash pop
```
After this the `updateHostsFile.py` script can be run to update the hosts
file.
## What is a hosts file?