Update CE from 2.11.0 to 2.13.5 git error

I am trying to update my passbolt following this procedre : https://help.passbolt.com/hosting/update

When I run git pull origin master

I get errors I tried to google and search forum to no avail.

vaultadmin@mac-svr-pr-vault:/var/www/passbolt$ sudo git pull origin master
From https://github.com/passbolt/passbolt_api

  • branch master -> FETCH_HEAD
    Updating 73da3302d0…1c92561a0e
    error: The following untracked working tree files would be overwritten by merge:
    .gitlab-ci/Jobs/debian_package_build.yml
    Berksfile
    Berksfile.lock
    Gemfile
    Gemfile.lock
    bin/update
    chefignore
    debian/README.debian.md
    debian/changelog
    debian/compat
    debian/conf/nginx-passbolt-ssl.conf
    debian/conf/nginx-passbolt.conf
    debian/config
    debian/control
    debian/control.in
    debian/copyright
    debian/cron.d.in
    debian/dirs
    debian/docs.in
    debian/install
    debian/lintian-overrides.in
    debian/logrotate.in
    debian/patches/01_paths_setup.patch
    debian/patches/02_webpaths_setup.patch
    debian/patches/03_cake_import_paths.patch
    debian/patches/series
    debian/postinst
    debian/postrm
    debian/preinst
    debian/prepare-files
    debian/rules
    debian/source/format
    debian/templates
    debian/triggers.in
    kitchen.yml
    plugins/Passbolt/EmailDigest/composer.json
    plugins/Passbolt/EmailDigest/config/bootstrap.php
    plugins/Passbolt/EmailDigest/config/config.php
    plugins/Passbolt/EmailDigest/config/routes.php
    plugins/Passbolt/EmailDigest/phpunit.xml.dist
    plugins/Passbolt/EmailDigest/src/Controller/EmailDigest/PreviewNextEmailsBatchController.php
    plugins/Passbolt/EmailDigest/src/Exception/UnsupportedEmailDigestDataException.php
    plugins/Passbolt/EmailDigest/src/Service/EmailDigestService.php
    plugins/Passbolt/EmailDigest/src/Service/PreviewEmailBatchService.php
    plugins/Passbolt/EmailDigest/src/Service/SendEmailBatchService.php
    plugins/Passbolt/EmailDigest/src/Shell/PreviewShell.php
    plugins/Passbolt/EmailDigest/src/Shell/SenderShell.php
    plugins/Passbolt/EmailDigest/src/Template/Email/html/LU/email_digest.ctp
    plugins/Passbolt/EmailDigest/src/Utility/Digest/AbstractDigest.php
    plugins/Passbolt/EmailDigest/src/Utility/Digest/Digest.php
    plugins/Passbolt/EmailDigest/src/Utility/Digest/DigestInterface.php
    plugins/Passbolt/EmailDigest/src/Utility/Digest/DigestRegisterEvent.php
    plugins/Passbolt/EmailDigest/src/Utility/Digest/DigestRegisterTrait.php
    plugins/Passbolt/EmailDigest/src/Utility/Digest/DigestsCollection.php
    plugins/Passbolt/EmailDigest/src/Utility/Digest/DigestsPool.php
    plugins/Passbolt/EmailDigest/src/Utility/Digest/SingleDigest.php
    plugins/Passbolt/EmailDigest/src/Utility/Factory/DigestFactory.php
    plugins/Passbolt/EmailDigest/src/Utility/Factory/EmailPreviewFactory.php
    plugins/Passbolt/EmailDigest/src/Utility/Mailer/EmailDigest.php
    plugins/Passbolt/EmailDigest/src/Utility/Mailer/EmailDigestInterface.php
    plugins/Passbolt/EmailDigest/src/Utility/Mailer/EmailInterface.php
    plugins/Passbolt/EmailDigest/src/Utility/Mailer/EmailPreview.php
    plugins/Passbolt/EmailDigest/tests/Lib/EmailDigestMockTestTrait.php
    plugins/Passbolt/EmailDigest/tests/TestCase/Unit/Service/EmailDigestServiceTest.php
    plugins/Passbolt/EmailDigest/tests/TestCase/Unit/Service/SendEmailBatchServiceTest.php
    plugins/Passbolt/EmailDigest/tests/TestCase/Unit/Utility/Digest/DigestsCollectionTest.php
    plugins/Passbolt/EmailDigest/tests/TestCase/Unit/Utility/Digest/DigestsPoolTest.php
    plugins/Passbolt/EmailDigest/tests/TestCase/Unit/Utility/Digest/SingleEmailDigestTest.php
    plugins/Passbolt/EmailDigest/tests/bootstrap.php
    plugins/Passbolt/EmailNotificationSettings/src/Utility/EmailNotificationSettingsDefinitionInterface.php
    plugins/Passbolt/EmailNotificationSettings/src/Utility/EmailNotificationSettingsDefinitionRegisterEvent.php
    plugins/Passbolt/EmailNotificationSettings/src/Utility/EmailNotificationSettingsDefinitionTrait.php
    plugins/Passbolt/EmailNotificationSettings/src/Utility/NotificationSettingsSource/ConfigEmailNotificationSettingsSource.php
    plugins/Passbolt/EmailNotificationSettings/src/Utility/NotificationSettingsSource/DbEmailNotificationSettingsSource.php
    plugins/Passbolt/EmailNotificationSettings/src/Utility/NotificationSettingsSource/DefaultEmailNotificationSettingsSource.php
    plugins/Passbolt/EmailNotificationSettings/src/Utility/NotificationSettingsSource/ReadableEmailNotificationSettingsSourceInterface.php
    plugins/Passbolt/EmailNotificationSettings/src/Utility/NotificationSettingsSource/WriteableEmailNotificationSettingsSourceInterface.php
    plugins/P
    Aborting

Hi @Symlink This is a git issue, so this might help: https://stackoverflow.com/q/17404316/8201657

Git is simply attempting to aide you in avoiding the overwriting of files in your tree that are not yet committed or stashed.

@Symlink maybe there is a change in these files and/or permissions which prevent git from updating them. You can try to reset your files with:

git fetch --all
git reset --hard origin/master

Somehow after

git fetch --all
git reset --hard origin/master

I ran :

$ git fetch origin tags/v2.13.5
$ git checkout tags/v2.13.5

and it worked but git pull origin master wouldn’t work.

Thanks for your help guys :slight_smile:

This topic was automatically closed 5 days after the last reply. New replies are no longer allowed.