Bugfix/302 assign random variation to mcs pcs life satisfaction scores#307
Conversation
|
Hi @dav-sonn - was going to merge this as it requires some further changes to things to be built on top of it. is it suitable to merge or should I hold off until after refactoring? |
- remove 'previously partnered' - change HM1_C to ordinal regression
20df665 to
b8b552c
Compare
Hi @andrewbaxter439 - the refactoring is done, but I haven't merged the branch yet, as I wanted to discuss with everybody an outstanding related issue. If possible, I'd wait until tomorrow's meeting to discuss this together. Many thanks! |
No worries, have a few things I think should be updated in this branch before merging anyway as the health module parts need some standardising and documenting. Will work on changes but hold off merging |
fdd5c13 to
8925d4d
Compare
…random-variation-to-mcs-pcs-life-satisfaction-scores
|
To review at meeting today @dav-sonn @justin-ven @matteorichiardi but should be ready to merge with refactoring finished. Ideally tidies up health variables to be consistent with prediction of other variables |
|
To note: updated variable name |
|
Hi @justin-ven - thanks for sorting this. Let me know if you need me to do any quick fixes my end |
|
Andy, I haven't been able to resolve the conflicts listed here - I think it might be worth using the "Convert to draft" option and then re-issuing the pull request. |
…random-variation-to-mcs-pcs-life-satisfaction-scores
0a27349 to
baa6e9d
Compare
|
Hi @justin-ven - managed to get it fixed here so good to merge I think? 👍 |
|
Awesome – well done Andy. Would be good to hear how you managed to sort the conflicts out (I was at my wit’s end)…
From: Andrew Baxter ***@***.***>
Sent: 27 January 2026 17:51
To: centreformicrosimulation/SimPaths ***@***.***>
Cc: justin-ven ***@***.***>; Mention ***@***.***>
Subject: Re: [centreformicrosimulation/SimPaths] Bugfix/302 assign random variation to mcs pcs life satisfaction scores (PR #307)
[Image removed by sender.]andrewbaxter439 left a comment (centreformicrosimulation/SimPaths#307)<#307 (comment)>
Hi @justin-ven<https://github.com/justin-ven> - managed to get it fixed here so good to merge I think? 👍
—
Reply to this email directly, view it on GitHub<#307 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AKJL7NH4G5QKN6NQQGXEIJT4I6JPXAVCNFSM6AAAAACPCYQDRWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTQMBWGMYTANBSGA>.
You are receiving this because you were mentioned.Message ID: ***@***.***>
|
|
Hi Justin, managed it by using GitKraken GUI to do it and select 'prefer incoming' on each file in the merge commit. Then could run again afresh to get updated Stats files. I've looked up and there's ways of doing the 'accept all incoming changes' in the git cli which I've never used but perhaps that's the way forward: https://stackoverflow.com/questions/278081/resolving-a-git-conflict-with-binary-files |
|
I tried to follow the directions for using the cli, but that didn't seem to help. Will bear in mind GitKraken next time I run into difficulty. |
Bringing in PR for comparison and checks just now, though do hold off merging until refactoring sorted.
What
Why