Error in updating rtabmap
Posted by
Masoumeh on
URL: http://official-rtab-map-forum.206.s1.nabble.com/Error-in-updating-rtabmap-tp8032.html
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?