Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/Refactor of neighbor array populating (issue #18) #19

Merged
merged 3 commits into from
Jan 20, 2017

Conversation

ootsby
Copy link
Contributor

@ootsby ootsby commented Jan 19, 2017

I tacked on a fix for application of the visual heuristic and removed an unnecessary (AFAICT) loop calling addNeighbors in the BSP mapgen.

@Hyftar
Copy link
Contributor

Hyftar commented Jan 20, 2017

Try squashing your last commit when fixing an existing commit instead of adding another commit. In this case this should be fairly straightforward; Just follow this tutorial.

Once you're done, just do a forced update using git push origin master -f (assuming origin is the name of your forked repo).

I think keeping (or at least striving to keep) a clean git history is quite important.

@ootsby
Copy link
Contributor Author

ootsby commented Jan 20, 2017

Thanks for the pointer. However, as far as I'm aware, the recipient has the option to squash a PR when they take it if they wish. Alternatively they can bounce it if there are issues with the automatic process and request a squash then.

@shiffman shiffman merged commit 610778b into CodingTrain:master Jan 20, 2017
@shiffman
Copy link
Member

Thanks for this!

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.

None yet

3 participants