Skip to content

Features/pressure mega newton per square meter #418

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

Merged
merged 1 commit into from
Mar 21, 2018
Merged

Features/pressure mega newton per square meter #418

merged 1 commit into from
Mar 21, 2018

Conversation

dschuermans
Copy link
Contributor

Added Mega prefix for NewtonPerSquareMeter in the pressure unit.
Not sure why RotationalStiffnessUnit also has changes, happend after I ran the bat file...

@angularsen
Copy link
Owner

angularsen commented Mar 19, 2018

Hey, you need to either rebase on top of upstream/master in order to lose all the old commits from this PR or manually cherry pick the commits you want.

Try this:

git checkout features/PressureMegaNewtonPerSquareMeter
git rebase --interactive upstream/master
# Remove unwanted commit lines in editor, then hit :x to save and exit from Vim editor
git push --force # Force push needed to rewrite history of your branch (removing commits)

As for getting extra changes when running generate-code.bat, this can happen if master has recently merged several pull requests and so needs to regenerate to get all the latest units. Normally this is safe to ignore, but I've pushed a new commit a66dcdf now that fixes that.

@dschuermans
Copy link
Contributor Author

@angularsen Thanks, i'll do it now and update the PR :)

"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "N/m²" ],
"AbbreviationsWithPrefixes": [ "kN/m²" ]
"AbbreviationsWithPrefixes": [ "kN/m²", "MN/m²" ]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AbbreviationsWithPrefixes is only needed if prefixing k and M does not work, so for en-US culture it can be removed. I'll remove this in master after merging. Russian still needs to be kept.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in #421

@angularsen angularsen merged commit 45eed33 into angularsen:master Mar 21, 2018
@angularsen
Copy link
Owner

@dschuermans dschuermans deleted the features/PressureMegaNewtonPerSquareMeter branch December 3, 2018 12:03
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.

2 participants