'How to match server repository with remote when last commits have been uploaded through FTP?
Instead of doing a git pull, last 4 commits, which have been pushed to remote repo, have been uploaded through FTP. Now i have a "dirty" working directory. If I do a "git pull" now, won't I have merge conflicts? What is the best way to solve this? I thought of doing a git push --force from server.
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|