Possibly not. You may lose some of your history.
If you have rewritten the history of your local repo such that the previous commit is gone, then once you force push those changes to the server you will not be able to get it back. Performing a force push makes the server copy match your local copy exactly, including any modifications to history.
If your goal isn't to rewrite history, I would recommend the following steps:
git pullto merge your remote repository with the remote repository. You will probably have merge conflicts.
Resolve the merge conflicts by hand.
Commit your resolution of the merge conflicts.
Do a normal push once the merge conflicts are resolved.