Closed t-sakashita closed 5 years ago
git checkout develop
git merge -X theirs eigen3
git rm 3rd-party/eigen3/doc/snippets/MatrixBase_part.cpp
git commit -m "update to Eigen3.3.7"
個別にgit rm
が必要だったりする。
https://stackoverflow.com/questions/173919/is-there-a-theirs-version-of-git-merge-s-ours
79b5d7bf56e74b23b50f3545f6ac64ed37188a46
boost::ublasへの依存性はなくなるか?