Quote Originally Posted by sherlyk View Post
I run command:

Code:
cd ~/www/imagehostnow.com
git pull origin master
Result:

Code:
sherly@HOME:~/www/imagehostnow.com$ cd ~/www/imagehostnow.com
sherly@HOME:~/www/imagehostnow.com$ git pull origin master
remote: Counting objects: 181, done.
remote: Compressing objects: 100% (169/169), done.
remote: Total 181 (delta 109), reused 0 (delta 0)
Receiving objects: 100% (181/181), 22.68 KiB | 0 bytes/s, done.
Resolving deltas: 100% (109/109), completed with 18 local objects.
From ssh://git.buyscripts.in:10022/buyscripts/imagehost
 * branch            master     -> FETCH_HEAD
   1316183..3fe7347  master     -> origin/master
Updating 1316183..3fe7347
error: Your local changes to the following files would be overwritten by merge:
    app/config/database.php
Please, commit your changes or stash them before you can merge.
Aborting
sherly@HOME:~/www/imagehostnow.com$

This git pull did not worked as local files changed.

git pull only work if your local files are not changed, if you change, make sure you commit.

For now, since the change is not critical, take git gui, then see the changes, take note of it. Git gui have option to revert changes (check the menu items, you will see it). Revert changes, make sure you can apply those changes back if needed, so if needed make a copy of the file before you revert.


Now

Code:
git status
Will say everything updated, no files are listed as changed in git gui too.

Now run, "git pull origin master" it will work.

Post result.