Updating your fork using the web interface

When you notice that your fork of the project is getting behind the master (because the header at the top of your fork reads "This branch is xx commits behind TravelMapping:master."), you should update your fork.

Instructions as posted by rickmastfan67 in the aaroads forum, with additional information from Jim and yakra:

Web interface:

1. https://github.com/TravelMapping/HighwayData
2. Look for the little 'green' icon beside the 'Branch: master' pull down and click it.
3. Look for the "compare across forks" text link and click it.
4. Change the 'Base Fork' to yours.
5. Hit the 'Create pull request' button.

Then you should be able to update your copy of the 'Master' on your fork.

Note that it ends up putting an extra commit into your subsequent pull request that accounts for the update to the master, but this should not cause any conflicts.

Performing this regularly will avoid conflicts with files that are edited by other collaborators, such as systems.csv or updates.csv.