These files diverged between v1.1 and the dev branch in the old repo. What is moving forward is the version with the more recent commit message. See file logs on old repo's v1.1 and dev branch if you want to investigate further.
Note that mlx and prj are binary files so merging is not supported.
simkaryote
commented
1 year ago
Sessions/casestudy_PCSK9.mlx Sessions/casestudy_TMDD.mlx app/+QSP/@Session/Session.m gQSPSim.prj
These files diverged between v1.1 and the dev branch in the old repo. What is moving forward is the version with the more recent commit message. See file logs on old repo's v1.1 and dev branch if you want to investigate further. Note that mlx and prj are binary files so merging is not supported.
Session might be mergeable.