Manufactored solution only#33
Conversation
Minus sign that I initially thought was required was incorrec... testing this now but making them positive seems to be getting correct results now - will make sure
|
Thanks @Aaron-Mullen-Hales. Can you check the conflict above: click on "Resolve conflicts" and then accept whichever version you intended to keep. I am not sure if you want the coefficients to be negative or positive in the fvOptions. FYI, the reason for this conflict is likely because your local main branch is out-of-date with the main branch here. Before creating a new local branch from main (or another branch), make sure you sync your local main branch. Codex can easily fix this too if you point it to this PR and it can explain it. |
|
Yeah I synched my main branch earlier today - that being said I am not entierly sure if it got rid of some work - I first created a backup branch with main before discarding the commits I had and updating with the new commits: I discarded because I saw that in the "behind" commits that main was missing there were the commits I made from different branches into the upstream. So I am hoping that this means the next time I make a new branch to commit something then it should be fine? and also that the other commits I made that I did not make a pr from are also used? though I am unsure of this last point which is why I created a backup first ? |
2 participants
Fixed minus sign