When updating from 1.7.2 to 1.8.3 I get the following message. Which would be the correct way to solve this? Use merge, rebase or fast-forward?
Thank you!
git pull origin master
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
git config pull.rebase false # merge (the default strategy)
git config pull.rebase true # rebase
git config pull.ff only # fast-forward only
You can replace "git config" with "git config --global" to set a default
preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.
From https://github.com/cytopia/devilbox
* branch master -> FETCH_HEAD
Updating 4b23dd6d..a05f3eea
error: Your local changes to the following files would be overwritten by merge:
.devilbox/www/config.php
.devilbox/www/htdocs/opcache.php
.devilbox/www/htdocs/vendor/phpmemcachedadmin-1.3.0/Config/Memcache.php
.devilbox/www/htdocs/vendor/phpredmin/libraries/drivers/db/redis.php
.devilbox/www/include/lib/Html.php
.github/ISSUE_TEMPLATE/bug_report.md
.github/workflows/ci-smoke-linux.yml
.github/workflows/lint.yml
.github/workflows/test-config.yml
.github/workflows/test-versions.yml
.gitignore
.tests/Makefile
.tests/scripts/.lib.sh
.tests/scripts/get-modules.sh
.tests/tests/config-xdebug.sh
.tests/tests/framework-cakephp.sh
.tests/tests/framework-drupal.sh
.tests/tests/framework-wordpress.sh
.tests/tests/vendor-adminer-mongo.sh
.tests/tests/vendor-adminer-mysql.sh
.tests/tests/vendor-adminer-pgsql.sh
.tests/tests/vendor-phppgadmin.sh
.travis.yml
CHANGELOG.md
CONTRIBUTING.md
README.md
UPDATING.md
cfg/php-ini-8.0/devilbox-php.ini-xdebug
docker-compose.yml
docs/_includes/links/examples.rst
docs/configuration-files/env-file.rst
docs/examples/setup-contao.rst
docs/getting-started/install-the-devilbox.rst
docs/howto/devilbox/move-projects-to-different-directory.rst
docs/intermediate/best-practice.rst
docs/intermediate/configure-php-xdebug/linux/vscode.rst
docs/intermediate/setup-valid-https.rst
docs/support/troubleshooting.rst
env-example
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
.devilbox/www/htdocs/config_httpd.php
.devilbox/www/htdocs/config_php.php
.devilbox/www/htdocs/vendor/adminer-4.7.7-en-php8.php
.devilbox/www/htdocs/vendor/adminer-4.7.7-en.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/CONTRIBUTING.md
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/ChangeLog
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/LICENSE
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/README
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/RELEASE-DATE-4.9.7
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/ajax.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/browse_foreigners.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/changelog.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/chk_rel.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/composer.json
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/composer.lock
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/config.inc.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_central_columns.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_datadict.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_designer.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_events.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_export.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_import.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_multi_table_query.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_operations.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_qbe.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_routines.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_search.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_sql.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_sql_autocomplete.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_sql_format.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_structure.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_tracking.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/db_triggers.php
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/chart.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/column_chart.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/line_chart.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/pie_chart.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/pma-relations-links.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/pma-relations-relation-link.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/pma-relations-relation-name.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/pma-relations-relation-view-link.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/query_result_operations.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/scatter_chart.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/spline_chart.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/timeline_chart.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_images/usergroups.png
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/bookmarks.rst.txt
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/charts.rst.txt
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/config.rst.txt
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/copyright.rst.txt
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/credits.rst.txt
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/developers.rst.txt
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/faq.rst.txt
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/glossary.rst.txt
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/import_export.rst.txt
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/index.rst.txt
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/intro.rst.txt
.devilbox/www/htdocs/vendor/phpmyadmin-4.9.7/doc/html/_sources/other.rst.t
Aborting