AARoads Forum

Please login or register.

Login with username, password and session length
Advanced search  

News:

New rules to ensure post quality. See this thread for details.

Author Topic: GitHub: How do I...?  (Read 4574 times)

yakra

  • *
  • Offline Offline

  • Posts: 1148
  • Location: Area Code 207, bub!
  • Last Login: August 01, 2021, 03:25:16 PM
GitHub: How do I...?
« on: August 31, 2015, 01:15:49 PM »

How do I update my yakra/HighwayData master repository so it's up-to-date with the TravelMapping/HighwayData master repository upstream?
Logged
"Officer, I'm always careful to drive the speed limit no matter where I am and that's what I was doin'." Said "No, you weren't," she said, "Yes, I was." He said, "Madam, I just clocked you at 22 MPH," and she said "That's the speed limit," he said "No ma'am, that's the route numbah!"  - Gary Crocker

oscar

  • *
  • Online Online

  • Posts: 8794
  • Age: 65
  • Location: Arlington, VA
  • Last Login: Today at 09:31:24 AM
    • my Hot Springs and Highways pages
Re: GitHub: How do I...?
« Reply #1 on: August 31, 2015, 01:57:14 PM »

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.
Logged
my Hot Springs and Highways pages, with links to my roads sites:
http://www.alaskaroads.com/home.html

yakra

  • *
  • Offline Offline

  • Posts: 1148
  • Location: Area Code 207, bub!
  • Last Login: August 01, 2021, 03:25:16 PM
Re: GitHub: How do I...?
« Reply #2 on: September 01, 2015, 12:20:35 AM »

Quote
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?

Quote
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?
« Last Edit: September 01, 2015, 12:23:31 AM by yakra »
Logged
"Officer, I'm always careful to drive the speed limit no matter where I am and that's what I was doin'." Said "No, you weren't," she said, "Yes, I was." He said, "Madam, I just clocked you at 22 MPH," and she said "That's the speed limit," he said "No ma'am, that's the route numbah!"  - Gary Crocker

oscar

  • *
  • Online Online

  • Posts: 8794
  • Age: 65
  • Location: Arlington, VA
  • Last Login: Today at 09:31:24 AM
    • my Hot Springs and Highways pages
Re: GitHub: How do I...?
« Reply #3 on: September 01, 2015, 01:16:58 AM »

Quote
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.
Logged
my Hot Springs and Highways pages, with links to my roads sites:
http://www.alaskaroads.com/home.html

rickmastfan67

  • The Invisible One
  • *
  • *
  • Offline Offline

  • Posts: 2941
  • I want I-67 in PA!!!!

  • Age: 36
  • Location: Pittsburgh, Pa, USA
  • Last Login: Today at 08:30:43 AM
Re: GitHub: How do I...?
« Reply #4 on: September 01, 2015, 03:59:37 AM »

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

  • *
  • Offline Offline

  • Posts: 5169
  • Check out https://travelmapping.net

  • Location: Amsterdam, NY
  • Last Login: Today at 08:33:45 AM
    • Travel and Other Pictures
Re: GitHub: How do I...?
« Reply #5 on: September 01, 2015, 07:15:19 AM »

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.
Logged
Photos I post are my own unless otherwise noted.
Signs: https://www.teresco.org/pics/signs/
Travel Mapping: https://travelmapping.net/user/?u=terescoj
Counties: http://www.mob-rule.com/user/terescoj
Twitter @JimTeresco (roads, travel, weather, sports)

yakra

  • *
  • Offline Offline

  • Posts: 1148
  • Location: Area Code 207, bub!
  • Last Login: August 01, 2021, 03:25:16 PM
Re: GitHub: How do I...?
« Reply #6 on: September 01, 2015, 11:35:19 AM »

Aah, so I'm essentially creating a pull request to pull from the TravelMapping/HighwayData into the Yakra/HighwayData master. BOOM. Done!
Logged
"Officer, I'm always careful to drive the speed limit no matter where I am and that's what I was doin'." Said "No, you weren't," she said, "Yes, I was." He said, "Madam, I just clocked you at 22 MPH," and she said "That's the speed limit," he said "No ma'am, that's the route numbah!"  - Gary Crocker

yakra

  • *
  • Offline Offline

  • Posts: 1148
  • Location: Area Code 207, bub!
  • Last Login: August 01, 2021, 03:25:16 PM
Re: GitHub: How do I...?
« Reply #7 on: October 06, 2015, 12:11:58 AM »

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!
Logged
"Officer, I'm always careful to drive the speed limit no matter where I am and that's what I was doin'." Said "No, you weren't," she said, "Yes, I was." He said, "Madam, I just clocked you at 22 MPH," and she said "That's the speed limit," he said "No ma'am, that's the route numbah!"  - Gary Crocker

rickmastfan67

  • The Invisible One
  • *
  • *
  • Offline Offline

  • Posts: 2941
  • I want I-67 in PA!!!!

  • Age: 36
  • Location: Pittsburgh, Pa, USA
  • Last Login: Today at 08:30:43 AM
Re: GitHub: How do I...?
« Reply #8 on: October 06, 2015, 01:27:12 AM »

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

Jim

  • *
  • Offline Offline

  • Posts: 5169
  • Check out https://travelmapping.net

  • Location: Amsterdam, NY
  • Last Login: Today at 08:33:45 AM
    • Travel and Other Pictures
Re: GitHub: How do I...?
« Reply #9 on: October 06, 2015, 11:49:06 AM »

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.
Logged
Photos I post are my own unless otherwise noted.
Signs: https://www.teresco.org/pics/signs/
Travel Mapping: https://travelmapping.net/user/?u=terescoj
Counties: http://www.mob-rule.com/user/terescoj
Twitter @JimTeresco (roads, travel, weather, sports)

froggie

  • *
  • Online Online

  • Posts: 11817
  • Location: Greensboro, VT
  • Last Login: Today at 09:43:43 AM
    • Froggie's Place
Re: GitHub: How do I...?
« Reply #10 on: November 14, 2015, 09:54:10 AM »

Quote
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?
Logged

Wadsteckel

  • *
  • Offline Offline

  • Posts: 8
  • Age: 52
  • Location: Emsworth, PA
  • Last Login: December 28, 2018, 07:53:47 PM
Re: GitHub: How do I...?
« Reply #11 on: November 14, 2015, 10:27:01 AM »

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
Logged

yakra

  • *
  • Offline Offline

  • Posts: 1148
  • Location: Area Code 207, bub!
  • Last Login: August 01, 2021, 03:25:16 PM
Re: GitHub: How do I...?
« Reply #12 on: November 14, 2015, 12:13:59 PM »

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.
Logged
"Officer, I'm always careful to drive the speed limit no matter where I am and that's what I was doin'." Said "No, you weren't," she said, "Yes, I was." He said, "Madam, I just clocked you at 22 MPH," and she said "That's the speed limit," he said "No ma'am, that's the route numbah!"  - Gary Crocker

 


Opinions expressed here on belong solely to the poster and do not represent or reflect the opinions or beliefs of AARoads, its creators and/or associates.