2019-11-29 10:12:14 0 Comments Git Boy.Lee

Git Demo: drop local change Force overwrite local file

In Git, sometime we need use the git data overwrite the local changes, this happens on online environment, this topic show how to do it


{ Error Info }

From https://git.yiilib.com/demo/
   9f84dae..7c1b32c  master     -> origin/master
Updating 696364b..7c1b32c
error: Your local changes to 'api/config/main-local.php' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge.


{ Solution }

git reset --hard
git pull