I run below commands in this order and got below result:
Code:
git pull origin master
git stash
git checkout master
git pull
php artisan migrate
Result:
Code:
sherly@HOME:~/www/imagehostnow.com$ git pull origin master
From ssh://git.buyscripts.in:10022/buyscripts/imagehost
* branch master -> FETCH_HEAD
Updating 4833b21..dc3262f
error: Your local changes to the following files would be overwritten by merge:
app/controllers/UploadController.php
Please, commit your changes or stash them before you can merge.
Aborting
sherly@HOME:~/www/imagehostnow.com$ git stash
Saved working directory and index state WIP on master: 4833b21 Merge branch 'issue73' into 'master'
HEAD is now at 4833b21 Merge branch 'issue73' into 'master'
sherly@HOME:~/www/imagehostnow.com$ git checkout master
Already on 'master'
Your branch is behind 'origin/master' by 10 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
sherly@HOME:~/www/imagehostnow.com$ git pull
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (6/6), done.
From ssh://git.buyscripts.in:10022/buyscripts/imagehost
* [new branch] issue39 -> origin/issue39
Updating 4833b21..dc3262f
Fast-forward
app/controllers/Admin/SearchController.php | 37 ++++++++++
app/controllers/Admin/SettingsController.php | 1 -
app/controllers/ImageController.php | 8 ++-
app/controllers/UploadController.php | 2 +
...3023_alter_table_spam_reports_add_reason_id.php | 30 ++++++++
...2015_01_23_060356_alter_table_images_add_ip.php | 30 ++++++++
app/models/SpamReport.php | 13 +++-
app/routes.php | 3 +-
app/views/admin/layouts/master.blade.php | 1 +
app/views/admin/search/index.blade.php | 79 ++++++++++++++++++++++
app/views/admin/settings/index.blade.php | 6 --
app/views/admin/spam_reports/index.blade.php | 2 +
app/views/image/index.blade.php | 47 ++++++++-----
13 files changed, 231 insertions(+), 28 deletions(-)
create mode 100644 app/controllers/Admin/SearchController.php
create mode 100644 app/database/migrations/2015_01_23_043023_alter_table_spam_reports_add_reason_id.php
create mode 100644 app/database/migrations/2015_01_23_060356_alter_table_images_add_ip.php
create mode 100644 app/views/admin/search/index.blade.php
sherly@HOME:~/www/imagehostnow.com$ php artisan migrate
Migrated: 2015_01_23_043023_alter_table_spam_reports_add_reason_id
Migrated: 2015_01_23_060356_alter_table_images_add_ip
sherly@HOME:~/www/imagehostnow.com$
Now image upload is successfull.
Bookmarks