Skip to content

refactor anyUnitsAttr - re-examine#683

Merged
prjemian merged 12 commits intomasterfrom
anyUnitsAttr_555
Oct 15, 2020
Merged

refactor anyUnitsAttr - re-examine#683
prjemian merged 12 commits intomasterfrom
anyUnitsAttr_555

Conversation

@prjemian
Copy link
Copy Markdown
Contributor

@prjemian prjemian commented Sep 11, 2019

fixes #555

@prjemian prjemian added this to the NXDL 2020.03 milestone Sep 11, 2019
@prjemian prjemian self-assigned this Sep 11, 2019
@prjemian
Copy link
Copy Markdown
Contributor Author

prjemian commented Sep 11, 2019

need to merge master into this branch

@prjemian
Copy link
Copy Markdown
Contributor Author

prjemian commented Jan 23, 2020

Willing to wait on this until next milestone. Today's release will then be merged into this PR, making it easier to resolve what actually will be changed.

@prjemian
Copy link
Copy Markdown
Contributor Author

prjemian commented Mar 4, 2020

merged master to this branch, resolved conflicts

@prjemian
Copy link
Copy Markdown
Contributor Author

prjemian commented Oct 12, 2020

Can this be merged now?

@prjemian
Copy link
Copy Markdown
Contributor Author

prjemian commented Oct 14, 2020

@PeterC-DLS Could you review this?

PeterC-DLS
PeterC-DLS requested changes Oct 15, 2020
View reviewed changes
Comment thread base_classes/NXtransformations.nxdl.xml Outdated
@prjemian prjemian requested a review from PeterC-DLS October 15, 2020 15:06
@PeterC-DLS
Copy link
Copy Markdown
Contributor

PeterC-DLS commented Oct 15, 2020

Surprising that there's conflicts given the minimal net change!

@prjemian
Copy link
Copy Markdown
Contributor Author

prjemian commented Oct 15, 2020

The conflicts with master were minor wording changes and removal of trailing whitespace that happened in master over a long lapse between the PR creation and next visit to the PR. The changes happened in CodeCamp 2020 (2020-1, that is).

@prjemian
Copy link
Copy Markdown
Contributor Author

prjemian commented Oct 15, 2020

Thanks for the review. This is not waiting on any vote so I'll merge now so there will not be another merge conflict if any of the existing PRs are merged. I expect each one of those may need to be rebased to master before they are merged.

@prjemian prjemian merged commit b4f08d8 into master Oct 15, 2020
@prjemian prjemian deleted the anyUnitsAttr_555 branch October 15, 2020 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PeterC-DLS PeterC-DLS PeterC-DLS approved these changes

@benajamin benajamin Awaiting requested review from benajamin

@FreddieAkeroyd FreddieAkeroyd Awaiting requested review from FreddieAkeroyd

@mkoennecke mkoennecke Awaiting requested review from mkoennecke

@phyy-nx phyy-nx Awaiting requested review from phyy-nx

@rayosborn rayosborn Awaiting requested review from rayosborn

@RussBerg RussBerg Awaiting requested review from RussBerg

@vasole vasole Awaiting requested review from vasole

@yayahjb yayahjb Awaiting requested review from yayahjb

Assignees

@prjemian prjemian

Labels

None yet

Projects

None yet

Milestone

NXDL 2020.10

Development

Successfully merging this pull request may close these issues.

refactor anyUnitsAttr

2 participants

@prjemian @PeterC-DLS