Print

Please login or register.
1 Hour 1 Day 1 Week 1 Month Forever
Login with username, password and session length

[yakra]

How do I update my yakra/HighwayData master repository so it's up-to-date with the TravelMapping/HighwayData master repository upstream?

[oscar]

How do I update my yakra/HighwayData master repository so it's up-to-date with the TravelMapping/HighwayData master repository upstream?

At least in the version I use, there's a "sync" button toward the upper right corner of the page you get after you select the HighwayData repository.

I used it this morning to update the copy of the repository on my hard drive, so I could send Jeff the latest copies of the Interstates .csv files for him to add the new I-41, without undoing Jim's addition yesterday of I-99 in New York. 

You should do another sync in a few days, after Jeff's changes are added to the master, before editing the Interstates .csv files for the new and merged Interstate routes in Texas.

[yakra]

At least in the version I use, there's a "sync" button toward the upper right corner of the page you get after you select the HighwayData repository.

Version? I'm using the webpage to do everything. Are you using a GUI application?

I used it this morning to update the copy of the repository on my hard drive

Hard drive... I don't believe the website does all that -- must be a GUI app, yes?

Can I sync using the web interface?

[oscar]

I used it this morning to update the copy of the repository on my hard drive

Hard drive... I don't believe the website does all that -- must be a GUI app, yes?

I'm using GitHub Desktop, which is a Microsloth Windoze application but might be available for other OSes. The Desktop has a "View on GitHub" option which takes me to https://github.com/TravelMapping/HighwayData/ That page has two options in the lower right corner, "Clone in Desktop" and "Download ZIP" which might be want you need. But I'm feeling chicken this late in the evening and haven't tried out either, since I can do my synching from the Desktop application.

[rickmastfan67]

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.

[Jim]

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.

Yes, that is what I've been doing.  It ends up putting an extra commit into your subsequent pull request that accounts for the update to the master, but that seems harmless enough.

Since I also have a clone on my hard drive, I have a couple extra steps to pull down the updated fork from GitHub to my computer, and when I'm done, I have to push up the changes to my fork in GitHub before I create a pull request.

I know this is all a little cumbersome but I really still believe the benefits of real version control make things much easier to manage overall.

[yakra]

Aah, so I'm essentially creating a pull request to pull from the TravelMapping/HighwayData into the Yakra/HighwayData master. BOOM. Done!

[yakra]

It's time for me to think about uploading the Texas State Highways, Loops, and Spurs.
With over 700 files between the three systems, using the web interface as I've been doing so far isn't a very good choice. I'd much rather automate the process using the command line interface. Uploading's never worked for me; I need to set up my username and password for the git server... somewhere, somehow...

Help!

[rickmastfan67]

You could always send all the files to Jim and have him upload them if you're having problems.

[Jim]

You could always send all the files to Jim and have him upload them if you're having problems.

Yes, send them CHM-style and I'll import them with the command line.

[froggie]

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.

What if we don't have a #4?  Or, alternatively, how do we create a #4?

[Wadsteckel]

What if we don't have a #4?  Or, alternatively, how do we create a #4?

Hi Froggie,

Was thinking the same thing.  I found that at step #3, in the top right corner, there is a Fork button.  Hover over it, and it gives the option to 'Fork your own copy of .... to your account'.  Hope this is right, since I did that. 

My question is, how do I upload my file to my account so that it then syncs with the main area?

-Regards,
Ed S

[yakra]

My question is, how do I upload my file to my account so that it then syncs with the main area?

To sync your file with the main repository after it's uploaded in yours, click the green icon beside the 'Branch: master' pull down, from the page for your personal repo.

To actually upload the file, well... I've just been using the text editor built into the web interface. Click the pencil icon to the top-right of the file's text. From there, I usually just paste in what I've been working on from a text editor or the waypoint editor.