Results 1 to 10 of 34

Thread: Pulling latest software changes from GIT

Hybrid View

Previous Post Previous Post   Next Post Next Post
  1. #1
    Join Date
    Sep 2003
    Posts
    3,040

    Default Pulling latest software changes from GIT

    To update your working copy with latest changes from GIT, run

    Code:
    cd YOUR_PROJECT_FOLDER
    git pull origin master
    In our case, for imagehostnow project, it will be

    Code:
    cd ~/www/imagehostnow.com
    git pull origin master
    Become PHP Expert in 30 days
    FreeMarriage.com - Free Online Matrimonial
    FlashWebHost.com - Professional Web Hosting, Designing.

  2. #2
    Join Date
    Nov 2009
    Posts
    76,596

    Default

    I run those two commands, and got following results:


  3. #3
    Join Date
    Sep 2003
    Posts
    3,040

    Default

    cd YOUR_PROJECT_FOLDER

    that means, you should "change directory" to the folder where your project files are.

    Replace YOUR_PROJECT_FOLDER with path to the folder where the files are, in your case, ~/www/imagehostnow.com

    git pull origin master

    It failed to pull changes from report to local as some files are changed on your PC.

    If the change you need to keep, then you need to make commit (make a new branch, never commit on master branch).

    For now, what you need to do is delete the changed file "bootstrap/start.php", then run "git pull origin master" again, it should work.

    Post result after doing it.
    Become PHP Expert in 30 days
    FreeMarriage.com - Free Online Matrimonial
    FlashWebHost.com - Professional Web Hosting, Designing.

  4. #4
    Join Date
    Nov 2009
    Posts
    76,596

    Default

    I deleted the changed file "bootstrap/start.php", Then run the command:

    Code:
    [email protected]:~/www/imagehostnow.com$ cd ~/www/imagehostnow.com
    [email protected]:~/www/imagehostnow.com$ git pull origin master
    From ssh://git.buyscripts.in:10022/buyscripts/imagehost
     * branch            master     -> FETCH_HEAD
    Updating 23bd260..1316183
    Fast-forward
     app/config/local/database.php                      |   6 +-
     app/controllers/Admin/AuthController.php           | 115 +++++++++++++++++++++
     app/controllers/Admin/HomeController.php           |  35 +++++++
     app/controllers/Admin/ImageController.php          |  70 +++++++++++++
     app/controllers/Admin/SettingsController.php       |  58 +++++++++++
     app/controllers/Admin/SpamReportsController.php    |  25 +++++
     app/controllers/Admin/UserController.php           |  65 ++++++++++++
     app/controllers/ImageController.php                |  52 +++++++++-
     app/controllers/UploadController.php               |  14 ++-
     app/controllers/UserController.php                 |  15 +++
     .../2015_01_09_084809_add_type_in_images.php       |  32 ++++++
     ...0_040524_add_default_image_privacy_in_users.php |  32 ++++++
     .../2015_01_10_062030_create_settings.php          |  33 ++++++
     .../2015_01_13_053228_create_spam_reports.php      |  33 ++++++
     app/models/Image.php                               |  25 +++++
     app/models/Net.php                                 |  29 ++++++
     app/models/Settings.php                            |  31 ++++++
     app/models/SpamReport.php                          |  17 +++
     app/models/User.php                                |  17 +++
     app/routes.php                                     |  40 +++++++
     app/views/admin/auth/forgot_password.blade.php     |  48 +++++++++
     app/views/admin/auth/login.blade.php               |  66 ++++++++++++
     app/views/admin/emails/reset_password.blade.php    |  16 +++
     app/views/admin/home/index.blade.php               |  44 ++++++++
     app/views/admin/image/index.blade.php              |  51 +++++++++
     app/views/admin/image/view.blade.php               |  78 ++++++++++++++
     app/views/admin/layouts/master.blade.php           |  92 +++++++++++++++++
     app/views/admin/settings/change_password.blade.php |  38 +++++++
     app/views/admin/settings/index.blade.php           |  47 +++++++++
     app/views/admin/spam_reports/index.blade.php       |  30 ++++++
     app/views/admin/user/edit.blade.php                |  35 +++++++
     app/views/admin/user/images.blade.php              |  53 ++++++++++
     app/views/admin/user/index.blade.php               |  47 +++++++++
     app/views/image/index.blade.php                    |  32 ++++++
     app/views/layouts/master.blade.php                 |   7 +-
     app/views/upload/success.blade.php                 |   7 +-
     app/views/user/image_settings.blade.php            |  31 ++++++
     app/views/user/images.blade.php                    |  40 ++++++-
     app/views/user/settings_menu.blade.php             |   3 +
     bootstrap/start.php                                |   3 +-
     40 files changed, 1496 insertions(+), 16 deletions(-)
     create mode 100644 app/controllers/Admin/AuthController.php
     create mode 100644 app/controllers/Admin/HomeController.php
     create mode 100644 app/controllers/Admin/ImageController.php
     create mode 100644 app/controllers/Admin/SettingsController.php
     create mode 100644 app/controllers/Admin/SpamReportsController.php
     create mode 100644 app/controllers/Admin/UserController.php
     create mode 100644 app/database/migrations/2015_01_09_084809_add_type_in_images.php
     create mode 100644 app/database/migrations/2015_01_10_040524_add_default_image_privacy_in_users.php
     create mode 100644 app/database/migrations/2015_01_10_062030_create_settings.php
     create mode 100644 app/database/migrations/2015_01_13_053228_create_spam_reports.php
     create mode 100644 app/models/Net.php
     create mode 100644 app/models/Settings.php
     create mode 100644 app/models/SpamReport.php
     create mode 100644 app/views/admin/auth/forgot_password.blade.php
     create mode 100644 app/views/admin/auth/login.blade.php
     create mode 100644 app/views/admin/emails/reset_password.blade.php
     create mode 100644 app/views/admin/home/index.blade.php
     create mode 100644 app/views/admin/image/index.blade.php
     create mode 100644 app/views/admin/image/view.blade.php
     create mode 100644 app/views/admin/layouts/master.blade.php
     create mode 100644 app/views/admin/settings/change_password.blade.php
     create mode 100644 app/views/admin/settings/index.blade.php
     create mode 100644 app/views/admin/spam_reports/index.blade.php
     create mode 100644 app/views/admin/user/edit.blade.php
     create mode 100644 app/views/admin/user/images.blade.php
     create mode 100644 app/views/admin/user/index.blade.php
     create mode 100644 app/views/user/image_settings.blade.php
    [email protected]:~/www/imagehostnow.com$

  5. #5
    Join Date
    Sep 2003
    Posts
    3,040

    Default

    Great, now git pull worked.

    See it created many new files ? Some of the new files are

    Code:
     create mode 100644 app/database/migrations/2015_01_09_084809_add_type_in_images.php
     create mode 100644 app/database/migrations/2015_01_10_040524_add_default_image_privacy_in_users.php
     create mode 100644 app/database/migrations/2015_01_10_062030_create_settings.php
     create mode 100644 app/database/migrations/2015_01_13_053228_create_spam_reports.php
    That means, new database migrations are added to project.

    You can migrate these files by running command

    Code:
    php artisan migrate
    That command will read folder app/database/migrations/ and migrate files that are yet to migrate, so your application have newer database tables and table structure.

    EDIT: Corrected spelling for artisan
    Become PHP Expert in 30 days
    FreeMarriage.com - Free Online Matrimonial
    FlashWebHost.com - Professional Web Hosting, Designing.

  6. #6
    Join Date
    Nov 2009
    Posts
    76,596

    Default

    I run the command.

    Code:
    php artisan migrate
    Find below the result.

    Code:
    [email protected]:~/www/imagehostnow.com$ php aritsan migrate
    Could not open input file: aritsan
    [email protected]:~/www/imagehostnow.com$

Bookmarks

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •