Do you still have the backup?
right click > tortoise git > stash save // this will save your modifications
right click > tortoise git > pull // this will update your git to the latest revision
right click > tortoise git > stash pop // this will apply the modifications your saved
sometimes you will encounter conflicts after using stash pop because of the modifications but I used to fix them manually.