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

TurnoutCircleSize #2851

Merged
merged 2 commits into from Jan 16, 2017

Conversation

Projects
None yet
4 participants
@geowar1
Contributor

geowar1 commented Jan 9, 2017

turnoutCircleSize wasn’t effecting the drawn turnout circle size.

geowar1 added some commits Dec 25, 2016

turnoutCircleSize
turnoutCircleSize wasn’t effecting the drawn turnout circle size.
@rhwood

This comment has been minimized.

Show comment
Hide comment
@rhwood

rhwood Jan 10, 2017

Contributor

@geowar1 Thanks for this contribution. Just a question: what tool are you using to edit these files?

Contributor

rhwood commented Jan 10, 2017

@geowar1 Thanks for this contribution. Just a question: what tool are you using to edit these files?

@geowar1

This comment has been minimized.

Show comment
Hide comment
@geowar1

geowar1 Jan 10, 2017

Contributor
Contributor

geowar1 commented Jan 10, 2017

@mattharris

This comment has been minimized.

Show comment
Hide comment
@mattharris

mattharris Jan 10, 2017

Member

@geowar1 Your branch turnoutCircleSize is way behind master and, amongst the things updated, were a bunch of whitespace changes.

image

Member

mattharris commented Jan 10, 2017

@geowar1 Your branch turnoutCircleSize is way behind master and, amongst the things updated, were a bunch of whitespace changes.

image

@geowar1

This comment has been minimized.

Show comment
Hide comment
@geowar1

geowar1 Jan 10, 2017

Contributor
Contributor

geowar1 commented Jan 10, 2017

@mattharris

This comment has been minimized.

Show comment
Hide comment
@mattharris

mattharris Jan 10, 2017

Member

@geowar1

From your local clone, you need to pull from the master branch of the upstream repository.

This will then merge the upstream changes into your current local branch.

Then you need to push those changes from your local clone to your repository on GitHub.

The following page might help you with this using GitHub Desktop (it's not a tool I use):

https://help.github.com/desktop/guides/contributing/syncing-your-branch/

Member

mattharris commented Jan 10, 2017

@geowar1

From your local clone, you need to pull from the master branch of the upstream repository.

This will then merge the upstream changes into your current local branch.

Then you need to push those changes from your local clone to your repository on GitHub.

The following page might help you with this using GitHub Desktop (it's not a tool I use):

https://help.github.com/desktop/guides/contributing/syncing-your-branch/

@rhwood

This comment has been minimized.

Show comment
Hide comment
@rhwood

rhwood Jan 11, 2017

Contributor

I highly recommend you use NetBeans on macOS when editing the JMRI source code; although BBEdit is an excellent editor, NetBeans will get lots of things "just right" and will apply a number of code formatting rules specific to JMRI with a single Ctrl+Shift+F keystroke (or, if you want, automatically on save).

Contributor

rhwood commented Jan 11, 2017

I highly recommend you use NetBeans on macOS when editing the JMRI source code; although BBEdit is an excellent editor, NetBeans will get lots of things "just right" and will apply a number of code formatting rules specific to JMRI with a single Ctrl+Shift+F keystroke (or, if you want, automatically on save).

@bobjacobsen bobjacobsen merged commit 5c057e1 into JMRI:master Jan 16, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@bobjacobsen

This comment has been minimized.

Show comment
Hide comment
@bobjacobsen

bobjacobsen Jan 16, 2017

Member

Thanks for the contribution.

I use BBEdit (11.6.3 currently) for about 95% of my JMRI work. I've got "auto-indent' and "auto-expand tabs" checked. It's using its Java-specific mode automatically. Things just seem to work.

Merged. And thanks again.

Member

bobjacobsen commented Jan 16, 2017

Thanks for the contribution.

I use BBEdit (11.6.3 currently) for about 95% of my JMRI work. I've got "auto-indent' and "auto-expand tabs" checked. It's using its Java-specific mode automatically. Things just seem to work.

Merged. And thanks again.

@bobjacobsen bobjacobsen added this to the 4.7.1 milestone Jan 16, 2017

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