Error in updating rtabmap

[Masoumeh]

Hi Mattieu,
I want to update my rtabmap. but when i do the following command, i recive the following error:

masoumeh@masoumeh-ThinkPad-T490s:~/rtabmap$ git pull origin master
remote: Enumerating objects: 35, done.
remote: Counting objects: 100% (35/35), done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 20 (delta 15), reused 14 (delta 11), pack-reused 0
Unpacking objects: 100% (20/20), done.
From https://github.com/introlab/rtabmap
 * branch            master     -> FETCH_HEAD
   4390cb6..e9d7fcd  master     -> origin/master
Updating 21737f9..e9d7fcd
error: Your local changes to the following files would be overwritten by merge:
        corelib/src/odometry/OdometryF2M.cpp
Please, commit your changes or stash them before you can merge.
Aborting



how can i fix it?

[Masoumeh]

Hi mattieu.

after that i do catkin_make, i receive the following error:

/home/masoumeh/rtabmap/bin/librtabmap_core.so: undefined reference to `PointMatcher<float>::DataPoints::getFeatureViewByName(std::__cxx11::basic_s
tring<char, std::char_traits<char>, std::allocator<char> > const&)'
/home/masoumeh/rtabmap/bin/librtabmap_core.so: undefined reference to `Nabo::NearestNeighbourSearch<float, Eigen::Matrix<float, -1, -1, 0, -1, -1>
 >::create(Eigen::Matrix<float, -1, -1, 0, -1, -1> const&, int, Nabo::NearestNeighbourSearch<float, Eigen::Matrix<float, -1, -1, 0, -1, -1> >::Sea
rchType, unsigned int, Nabo::Parameters const&)'
/home/masoumeh/rtabmap/bin/librtabmap_core.so: undefined reference to `PointMatcherSupport::InvalidElement::InvalidElement(std::__cxx11::basic_str
ing<char, std::char_traits<char>, std::allocator<char> > const&)'
/home/masoumeh/rtabmap/bin/librtabmap_core.so: undefined reference to `PointMatcher<float>::ICP::operator()(PointMatcher<float>::DataPoints const&
, PointMatcher<float>::DataPoints const&)'
/home/masoumeh/rtabmap/bin/librtabmap_core.so: undefined reference to `PointMatcher<float>::ICPChainBase::~ICPChainBase()'
/home/masoumeh/rtabmap/bin/librtabmap_core.so: undefined reference to `PointMatcher<float>::ICPChainBase::loadFromYaml(std::istream&)'
/home/masoumeh/rtabmap/bin/librtabmap_core.so: undefined reference to `PointMatcher<float>::DataPoints::Labels::Labels()'
/home/masoumeh/rtabmap/bin/librtabmap_core.so: undefined reference to `PointMatcher<float>::get()'
/home/masoumeh/rtabmap/bin/librtabmap_core.so: undefined reference to `PointMatcher<float>::DataPoints::conservativeResize(long)'
collect2: error: ld returned 1 exit status
rtabmap_ros/CMakeFiles/rtabmap_icp_odometry.dir/build.make:947: recipe for target '/home/masoumeh/catkin_ws4/devel/lib/rtabmap_ros/icp_odometry' f
ailed
make[2]: *** [/home/masoumeh/catkin_ws4/devel/lib/rtabmap_ros/icp_odometry] Error 1
CMakeFiles/Makefile2:2939: recipe for target 'rtabmap_ros/CMakeFiles/rtabmap_icp_odometry.dir/all' failed
make[1]: *** [rtabmap_ros/CMakeFiles/rtabmap_icp_odometry.dir/all] Error 2
[ 70%] Linking CXX shared library /home/masoumeh/catkin_ws4/devel/lib/librtabmap_ros.so
[ 70%] Built target rtabmap_ros
Makefile:145: recipe for target 'all' failed
make: *** [all] Error 2
Invoking "make -j8 -l8" failed


how can I fix it?