how to update from git and merge with local modifications

Posted by m.omar82 on
URL: http://official-rtab-map-forum.206.s1.nabble.com/how-to-update-from-git-and-merge-with-local-modifications-tp157.html

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