Author Topic: usaga (Georgia State Highways) - Preview  (Read 25663 times)

0 Members and 1 Guest are viewing this topic.

Offline Jim

  • TM Collaborator
  • Hero Member
  • *****
  • Posts: 1560
  • Last Login:Yesterday at 11:39:58 pm
Re: usaga (Georgia State Highways) - Preview
« Reply #210 on: December 02, 2019, 07:56:05 am »
I can get this stuff ready to merge back in, but would like to address some of these items from my last couple posts in the process.
@ntallyn, once you go to merge it back into your master branch, there will be merge conflicts. Rather than poke the git gods with a stick & try to resolve them, I'm thinking that resetting your master branch to the state it was in before your last commit may be the safer option. It's a clunky process, a bit roundabout. I can post instructions.

For our purposes it might be easiest to delete and recreate the fork.  I think this would only be problematic if there are changes in the local clone that are not yet either in the TravelMapping master or in the offending pull request that yarka's working through.

Offline neroute2

  • Sr. Member
  • ****
  • Posts: 355
  • Last Login:Yesterday at 10:44:31 pm
Re: usaga (Georgia State Highways) - Preview
« Reply #211 on: December 02, 2019, 08:22:14 am »
To update your own repository, use this link (replacing neroute2 with your own username): https://github.com/neroute2/HighwayData/compare/master...TravelMapping:master

Offline yakra

  • TM Collaborator
  • Hero Member
  • *****
  • Posts: 2373
  • Last Login:Yesterday at 11:29:13 pm
Re: usaga (Georgia State Highways) - Preview
« Reply #212 on: December 02, 2019, 10:13:07 am »
To update your own repository, use this link (replacing neroute2 with your own username): https://github.com/neroute2/HighwayData/compare/master...TravelMapping:master
That would cause some hairy merge conflicts.

For our purposes it might be easiest to delete and recreate the fork.  I think this would only be problematic if there are changes in the local clone that are not yet either in the TravelMapping master or in the offending pull request that yarka's working through.
Probably easier, yes. ntallyn would lost the existing pull request and issue history for his fork. And it looks like there are none.
Yes, delete and recreate looks simpler here.

https://xkcd.com/1597/
« Last Edit: December 02, 2019, 10:57:07 am by yakra »