Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Utilize new macros and correct some sb_UT.c merge conflicts #693

Closed
CDKnightNASA opened this issue May 8, 2020 · 4 comments · Fixed by #698
Closed

Utilize new macros and correct some sb_UT.c merge conflicts #693

CDKnightNASA opened this issue May 8, 2020 · 4 comments · Fixed by #698
Assignees
@CDKnightNASA
Labels
enhancement unit-test
Milestone
Bootes

Comments

@CDKnightNASA
Copy link
Contributor

Describe the bug
Doing the merge conflicts for the ic merges, I mis-merged a couple of Joe's changes ( fix #245 ).

Reporter Info
Christopher.D.Knight@nasa.gov
@CDKnightNASA CDKnightNASA self-assigned this May 8, 2020
@CDKnightNASA
Copy link
Contributor Author

will resolve this once the current IC is merged into master

@skliper
Copy link
Contributor

skliper commented May 11, 2020

Can it be resolved for this round based on the IC? @astrogeco

@CDKnightNASA
Copy link
Contributor Author

Can it be resolved for this round based on the IC? @astrogeco

I defer to your best judgement on the process by which my fixes can be merged in.

@skliper
Copy link
Contributor

skliper commented May 11, 2020

@CDKnightNASA Standby... I'll link a PR under which you'll be able to update/fix (based on current IC).

@skliper skliper mentioned this issue May 11, 2020
Closed
@skliper skliper linked a pull request May 11, 2020 that will close this issue
(WIP) Fix #693, Refactor of sb_UT updates to use macros #696
Closed
@CDKnightNASA CDKnightNASA mentioned this issue May 12, 2020
Merged
@skliper skliper linked a pull request May 12, 2020 that will close this issue
Fix #693, Utilize UT macros in sb_UT #698
Merged
@skliper skliper added this to the 6.8.0 milestone May 12, 2020
@skliper skliper changed the title correct some sb_UT.c merge conflicts Utilize new macros and correct some sb_UT.c merge conflicts May 12, 2020
# for free to join this conversation on GitHub. Already have an account? # to comment
Assignees

@CDKnightNASA CDKnightNASA

Labels
enhancement unit-test
Projects
None yet
Milestone
Bootes
2 participants
@CDKnightNASA @skliper