Skip to content

Rename Flow to VolumeFlow #363

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

Closed
3 tasks
angularsen opened this issue Jan 10, 2018 · 8 comments
Closed
3 tasks

Rename Flow to VolumeFlow #363

angularsen opened this issue Jan 10, 2018 · 8 comments

Comments

@angularsen
Copy link
Owner

To disambiguate it from MassFlow and more consistent naming.

  • Mark all Flow units as obsolete via .json file (example: TemperatureDelta.KelvinDelta)
  • Add VolumeFlow .json based on Flow (copied and renamed)
  • Run generate-code.bat

All obsoleted code will be addressed on next major version bump, as listed in #180 .

@gojanpaolo
Copy link
Contributor

gojanpaolo commented Jan 10, 2018

I can do this but I have a pending PR where I added more Flow Units. Is it ok to branch from there?

@angularsen
Copy link
Owner Author

angularsen commented Jan 10, 2018

You can, but before this can be reviewed it should rebased on top of origin/master so that you don't include flow unit changes in the PR. Easiest to keep branches off of origin/master to begin with.

@gojanpaolo
Copy link
Contributor

How do I do that? Sorry, kinda new to GitHub.

@angularsen
Copy link
Owner Author

In git command line, something like this:

$ (someotherbranch): git checkout -b mynewbranch origin/master
$ (mynewbranch): ...do stuff...
$ (mynewbranch): git commit
$ (mynewbranch): git push

Then create PR from mynewbranch on your fork.

@gojanpaolo
Copy link
Contributor

I just did something like this...
$ (AddMoreFlowUnits): git checkout -b RenameFlowToVolumeFlow origin/master

but it didn't get where I left off from AddMoreFlowUnits

@gojanpaolo
Copy link
Contributor

So I did the tasks for this issue but branching from PR #361

I guess I'll just wait for that PR to be accepted before I submit PR for RenameFlowToVolumeFlow branch ?

@angularsen
Copy link
Owner Author

angularsen commented Jan 10, 2018

Ah I see.
Easiest route: Wait until the first branch is merged into master, then branch off master to do the rename.
Harder route: Branch off AddMoreFlowUnits now, do the rename, push the branch and create PR with a note saying this should not be merged until the first PR is merged. After it is merged, rebase on top of orgin/master to effectively get to the same state as the easy route, then force push that to update the PR and notify it is ready for review.

Frankly, the latter option does not gain much and adds a lot more friction so I would go with the easy route.

@gojanpaolo
Copy link
Contributor

Alright. Let's just do the Easy route. It's quick to do the rename anyway :)

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

No branches or pull requests

2 participants