65_update_variable_info

[jimrothstein]

PLACEHOLDER - no review

[jimrothstein]

@ddsjoberg
A draft ... If ok, I will put into proper style, roxygen, lint,
thx!

[ddsjoberg]

@jimrothstein the update looks good to me!

But it looks like we didn't pull the most recent changes into your branch before making the update. Can you resolve the merge conflicts?

If it were me, I would probably undo the updates I made, pull the updates from the main branch, then re-update the labels.

[jimrothstein]

Will do... I need a day or so to correctly roll back my commits; then update ... (Appreciate your patience; all this may be straightforward, but I need the practice) 😄

…

On Mon, Jul 21, 2025 at 4:02 PM Daniel Sjoberg ***@***.***> wrote: *ddsjoberg* left a comment (pharmaverse/admiraldiscovery#67) <#67 (comment)> @jimrothstein <https://github.com/jimrothstein> the update looks good to me! But it looks like we didn't pull the most recent changes into your branch before making the update. Can you resolve the merge conflicts? If it were me, I would probably undo the updates I made, pull the updates from the main branch, then re-update the labels. — Reply to this email directly, view it on GitHub <#67 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AB6BJ7ZQXAYVW2WPJDL7H2T3JVWQVAVCNFSM6AAAAACAEUQD5GVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTAOJZG43TQMRUG4> . You are receiving this because you were mentioned.Message ID: ***@***.***>

[jimrothstein]

@ddsjoberg
Propose to do this: (many ways to do; but also many wrong ways)

• stash or just save the one *.R file that does the work.
• current PR: close or delete
• main: get all the updates
• checkout a new branch, from main Call it temp
• rebase my current work (ie outdated) onto the new temp branch.
• push; create new PR

Worst case: copy/paste the R file onto temp branch; push, PR etc.

[ddsjoberg]

Instead of doing any fancy git work, I would just make a new branch that has all the updates from main, and rerun my script to update the labels. (I am all about avoiding complex git workflows!)

[jimrothstein]

Please SEE VERSION2, PR #72