opensafely / hydroxychloroquine-research

0 stars 1 forks source link

Bringing in code from ICS #10

Closed DarthCTR closed 4 years ago

DarthCTR commented 4 years ago

I brought in the first couple data cleaning editors from ICS and amended to HCQ study. I do not expect the checks to fully pass as there are still some variables missing. New variables are currently in master branch. Once this pull request merged into master, I will finish up data cleaning with the new variables. Thank you!

DarthCTR commented 4 years ago

@brianmackenna @alexwalkercebm @CarolineMorton feedback is welcome if I could do this better in future :)

alexwalkerepi commented 4 years ago

The current test failure is due to a technical test set up thing, which has already been fixed in #5.

DarthCTR commented 4 years ago

@alexwalkercebm thanks for these comments. So to be clear, should I remove the input.csv from the analysis folder on my local repo? Or will the new .gitignore take care of that and I can leave it where it's at now?

alexwalkerepi commented 4 years ago

@alexwalkercebm thanks for these comments. So to be clear, should I remove the input.csv from the analysis folder on my local repo? Or will the new .gitignore take care of that and I can leave it where it's at now?

If you remove it temporarily, commit that change, then add it back, it shouldn't let you commit it again. To address the second point, if you add

analysis/*
!*.do
!*.ado
!*.hlp
!*.py
!*.sthlp

to the .gitignore then it should allow you to add Stata files to the analysis folder, but prevent other things.

DarthCTR commented 4 years ago

Ok, I've made the suggested changes. committed and pushed. Now what?

alexwalkerepi commented 4 years ago

There are conflicts that need to be resolved. The easiest way to do this is to merge the mater into this branch. On GitHub desktop that's here, then follow the prompt (for the model.do you'll have to manually pick which version of the code you want in your text editor).

image