Charging battery simultaneously from 2 sources
Current shared Voltage regulators that do not sense remotely are inherently stable with Diode OR isolation.  ( high supply delivers the current.)


Other related info but same as your situation


Unlike above Current Shared  DC supplies with shared remote sensing must be balanced within 10% typically and often require a preload of 10% to be stable due to change in loop gain high low load.  

I recall 20 yrs ago in RB, Cali,USA (Unisys Server factory) we had redundant Current shared dual supplies with major brand OEM source who had to come out and view stability oscillation for themselves to know their design failed without a 10% preload, so we added this to the Production initial HASS test process.