t-sakashita / rokko

Integrated Interface for libraries of eigenvalue decomposition
Boost Software License 1.0
10 stars 2 forks source link

Eigen3を最新版に置き換える。 #324

Closed t-sakashita closed 5 years ago

t-sakashita commented 5 years ago

boost::ublasへの依存性はなくなるか?

t-sakashita commented 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"

https://yu8mada.com/2018/08/18/what-is-the-difference-between-the-strategy-options-ours-and-theirs-when-merging-with-the-recursive-strategy-in-git/

個別にgit rmが必要だったりする。 https://stackoverflow.com/questions/173919/is-there-a-theirs-version-of-git-merge-s-ours

t-sakashita commented 5 years ago

79b5d7bf56e74b23b50f3545f6ac64ed37188a46