-
Notifications
You must be signed in to change notification settings - Fork 3
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
Closes #11 : vs_metabolic test data draft created #17
Conversation
@Siddhesh2097 i guess we hold off on this until we have @AndersAskeland merge in something for #12 ? As after that you can then use |
Yes @manciniedoardo , we'll merge once dm_metabolic is ready |
@Siddhesh2097 - #12 is now closed and merged, so please:
Thanks! |
Merge branch 'main' of github.com:pharmaverse/admiralmetabolic into 11_create_vs_metabolic # Conflicts: # R/data.R
@manciniedoardo |
Hi @Siddhesh2097, something funny seems to be happening here as your feature branch is way behind with respect to what is in |
Ok, try remove them, no big deal if something goes wrong as we are working in a feature branch |
Okay, I deleted those two files and ran a git pull origin main . These are the files in my git currently after pulling. Earlier , I had restored the files that I didn't work on and didn't want to commit those. Doing that, I realized there were few updates from main that were required and I manually re-updated them. This is the reason, we are seeing that feature branch is way behind w.r.t main branch. |
ok, looks good, could you try resolve the conflict in |
Hmm. something is still wrong as the changes asre still present. Not sure what happened here. I think the easiest and fastest solution would be if you create a new branch off of |
Thank you for your Pull Request! We have developed this task checklist from the Development Process Guide to help with the final steps of the process. Completing the below tasks helps to ensure our reviewers can maximize their time on your code as well as making sure the admiral family codebase remains robust and consistent.
Please check off each taskbox as an acknowledgment that you completed the task or check off that it is not relevant to your Pull Request. This checklist is part of the Github Action workflows and the Pull Request will not be merged into the
main
branch until you have checked off each task.styler::style_file()
to style R and Rmd filesdevtools::document()
so all.Rd
files in theman
folder and theNAMESPACE
file in the project root are updated appropriatelyNEWS.md
under the header# admiral<ext> (development version)
if the changes pertain to a user-facing function (i.e. it has an@export
tag) or documentation aimed at users (rather than developers)pkgdown::build_site()
and check that all affected examples are displayed correctly and that all new functions occur on the Reference page.lintr::lint_package()
R CMD check
locally and address all errors and warnings -devtools::check()