Closed recuero closed 3 years ago
@dschwen Is something like this what you have in mind?
The conflicting MOOSE routine has not been merged yet.
MOOSE next won't pass until this is in... FYI
@loganharbour, @dschwen If all the tests pass, please review and merge if appropriate.
I thought CIVET rules were such that we had to take care of this conflict in MAGPIE only. Wonder if rules changed in between https://github.com/idaholab/moose/pull/16024 got tested and merged.
Also, not sure which MOOSE branch will be pulled here, probably not next
. We may need to merge this even if tests here fail to make MOOSE next
pass.
Update the moose submodule
Closes #451