How to re-merge in git?

Question

git

Using Git GUI
Situation :
Created a branch, made changes, made commit , push , merge to develop branch .
Another coder merges his branch into the develop branch , and at the same time wipes my work by uploading an old version of the code.
Question :
How can I re- merge my code? (preferably using Git GUI or gitlab.ru)

Answer 1

git cherry-pick

Answer 2

1.git pull
2.git merge