. ____ . ____________________________
|/ \| | |
[| ♥ ♥ |] | Git Deployment Script v0.1 |
|___==___| / © oodavid 2012 Newsite.by |
|____________________________|

    $ echo $PWD
/var/www/maunfeld.ru
$ whoami
ivan
$ git add --all

$ git commit -m "Changes on production"
[master 33217c2] Changes on production
 1 file changed, 21 insertions(+), 5 deletions(-)
$ git pull origin master
From bitbucket.org:newsite/maunfeld.ru
 * branch            master     -> FETCH_HEAD
Already up-to-date.
$ git checkout --theirs .

$ git commit -am "Remote Conflict"
On branch master
nothing to commit, working directory clean
$ git push origin master
To git@bitbucket.org:newsite/maunfeld.ru.git
   3bb860d..33217c2  master -> master
$ git submodule sync

$ git submodule update

$ git submodule status