Pulling latest software changes from GIT

[sherlyk]

I changed database,username,password on database.php file
Then my local site is http://imagehostnow.dev/ working fine.

[admin]

I changed database,username,password on database.php file
Then my local site is http://imagehostnow.dev/ working fine.

Look like you don't read/understand my previous reply.

What i asked was to verify if your local copy is latest version (same as that in gitlab/server). Verify it and post result.

[sherlyk]

I run these command:

git pull origin master

git log

Last commit in gitlab result:

sherly@HOME:~/www/imagehostnow.com$ git pull origin master 

remote: Counting objects: 32, done.
remote: Compressing objects: 100% (31/31), done.
remote: Total 32 (delta 22), reused 0 (delta 0)
Unpacking objects: 100% (32/32), done.
From ssh://git.buyscripts.in:10022/buyscripts/imagehost
 * branch            master     -> FETCH_HEAD
   8ffcaab..5bc1661  master     -> origin/master
Updating 8ffcaab..5bc1661
Fast-forward
 app/controllers/Admin/SettingsController.php |  2 ++
 app/controllers/UploadController.php         |  6 +++++-
 app/views/admin/settings/index.blade.php     | 12 ++++++++++++
 app/views/image/index.blade.php              |  8 ++++++--
 app/views/user/images.blade.php              |  4 ++--
 5 files changed, 27 insertions(+), 5 deletions(-)
sherly@HOME:~/www/imagehostnow.com$ 
sherly@HOME:~/www/imagehostnow.com$ git log
commit 5bc166168c718b92944878fcf027ea2a50781082
Merge: 015aac2 ee9a2f4
Author: Yujin Boby <[email protected]>
Date:   Wed Jan 21 06:35:33 2015 +0000

    Merge branch 'issue63' into 'master'
    
    Issue63
    
    fixed #63
    
    See merge request !52

commit ee9a2f4cef4f07f4f5b6711f3628a1073f9cc4cb
Author: Suneesh <[email protected]>
Date:   Wed Jan 21 11:58:21 2015 +0530

    HTML share code for images

commit 015aac2c438349804bb22838362d253ddffcc186
Merge: daf196d c1d9f8b
Author: Yujin Boby <[email protected]>
Date:   Wed Jan 21 05:31:21 2015 +0000
:

[admin]

Ok, remember these steps. You will need to do this multiple times a day when you working on this site so you will get code changed by other team members.

Now your site won't work as database.php get reverted back.

What is the solution ? Changing it each time is lot of wasted time for everyone in team. Do you think there can be a solution with out changing password each time ?