how to update from git and merge with local modifications

[m.omar82]

Dear friends
how to update from git and merge with local modifications, I am using Eclipse
Thanks

[matlabbe]

Assuming that you have cloned the Github repository:

$ git clone https://github.com/introlab/rtabmap.git

To update to latest changes:

$ cd rtabmap
$ git pull origin master

In Eclipse (you may need to install Git for Eclipse): Right-click on the project -> Team -> Pull. You can also do "Synchronize Workspace" and see your changes and those in the upstream repository.