Skip to content

Conversation

@bnason
Copy link

@bnason bnason commented Jan 7, 2012

No description provided.

alienacorn and others added 19 commits January 6, 2012 20:48
This is not actually correct, but it makes for a better subway map without losing too much detail.
…g a list of stations and which destinations they connect to. This format is more convenient for automatic pathfinding.
…ps, counting the start and end points. Results are given in a list sorted by the number of stops.

Modify generate-nodes.py to support a hacky javascript file output mode as well, required by route.html right now.
@leafstorm
Copy link
Owner

Dude, I would love to merge this, except for everything between a739e77 and 1e1329b. I am comparatively new to Git, do you have any idea how I could do that?

@bnason
Copy link
Author

bnason commented Jan 8, 2012

To be honest, im new to the whole collaborative aspect of git as well. I got some help from #Git on FreeNode and they instructed me to rebase my master branch with your master branch which is what I did with this commit. It SHOULD just merge onto your head without any trouble. Though If you want I can create a new branch straight off of your master and apply my changes to it and then resubmit the pull request. let me know

@alienacorn
Copy link

Another strategy would be to delete the files related to the route finding tool after getting bnason's changes.

I'm also new to Git/Github. Thanks for putting up with what I dumped on you. It has been good for learning the tools, at least.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants