search

LLNL / merlin

Machine Learning for HPC Workflows
MIT License
118 stars 26 forks source link

Version 1.10.2 #438

Closed bgunnar5 closed 1 year ago

bgunnar5 commented 1 year ago

See CHANGELOG for changes

bgunnar5 commented 1 year ago

Looks like fixing the merge conflicts on my forked repo and then merging did not work. I'm cloning the actual repo and fixing them real fast instead. The merge conflicts it's finding are all related to the version bump

koning commented 1 year ago

Yes that is strange, I've seen this a few times with gitlab, merge main, then create PR but there are conflicts.