Closed nicolekjones closed 1 year ago
Hi, @nicolekjones . Many thanks for this update and appreciate your flexibility to check on your code and adapt to the updated R environment. One thing I noticed in this PR is that there is a conflict with the specs being used. We did merge a new set of specs from #90 which should be in main now. I just wanted to make sure you did this :
git checkout main
git pull
git checkout [your branch]
git merge --no-edit main
then run renv::restore() in console
Before you made the update to the ADLBC specs above?
Hi, @nicolekjones . Many thanks for this update and appreciate your flexibility to check on your code and adapt to the updated R environment. One thing I noticed in this PR is that there is a conflict with the specs being used. We did merge a new set of specs from #90 which should be in main now. I just wanted to make sure you did this :
git checkout main git pull git checkout [your branch] git merge --no-edit main then run renv::restore() in console
Before you made the update to the ADLBC specs above?
I thin i missed that last step. I did:
git checkout main
git pull main
git checkout -b
I believe there was a merge that happened between creating the branch and my final push I’ll resolve this afternoon 😁
Hi, @nicolekjones . Many thanks for this update and appreciate your flexibility to check on your code and adapt to the updated R environment. One thing I noticed in this PR is that there is a conflict with the specs being used. We did merge a new set of specs from #90 which should be in main now. I just wanted to make sure you did this :
git checkout main git pull git checkout [your branch] git merge --no-edit main then run renv::restore() in console
Before you made the update to the ADLBC specs above?
I thin i missed that last step. I did:
git checkout main git pull main git checkout -b
I believe there was a merge that happened between creating the branch and my final push I’ll resolve this afternoon 😁
Thanks, @nicolekjones . I see now the bumps we can run into with the git workflow. I'm still learning myself. :)
@laxamanaj Looks like I resolved merge conflict! Checks are running. If any have issue I'll resolve after they finish.
I think merge conflicts are often part of the journey. I think we've done a good job so far :)
@laxamanaj, just pushed the updates. For those full_joins yes we do expect a one to many merge. updated so the warning is suppressed!
Many thanks for these swift updates, @nicolekjones . I will merge now.
Hi all,
I did a bit of cleaning of the code
Specs were updated