Problem attempting to Upgrade from BookStack v23.05.2 to the latest release #4408

New Issue

OVERLORD · 2026-02-05T08:49:31+03:00

OVERLORD commented

2026-02-05 08:49:31 +03:00

Originally created by @EAwesomeK on GitHub (Jan 16, 2024).

Attempted Debugging

I have read the debugging page

Searched GitHub Issues

I have searched GitHub for the issue.

Describe the Scenario

When using the following command: git pull origin release I receive the following error message:

Resolving deltas: 100% (3956/3956), completed with 473 local objects.
From https://github.com/BookStackApp/BookStack

branch release -> FETCH_HEAD
4ac8ecad..457adc1f release -> origin/release
error: Your local changes to the following files would be overwritten by merge:
.env.example
Please commit your changes or stash them before you merge.
Aborting
Updating 4ac8ecad..457adc1f

I did NOT modify this file - in any case how do I commit changes?

Exact BookStack Version

v23.05.2

Log Content

No response

Hosting Environment

Windows 2012 R2 Server

Originally created by @EAwesomeK on GitHub (Jan 16, 2024). ### Attempted Debugging - [X] I have read the debugging page ### Searched GitHub Issues - [X] I have searched GitHub for the issue. ### Describe the Scenario When using the following command: git pull origin release I receive the following error message: Resolving deltas: 100% (3956/3956), completed with 473 local objects. From https://github.com/BookStackApp/BookStack * branch release -> FETCH_HEAD 4ac8ecad..457adc1f release -> origin/release error: Your local changes to the following files would be overwritten by merge: .env.example Please commit your changes or stash them before you merge. Aborting Updating 4ac8ecad..457adc1f I did NOT modify this file - in any case how do I commit changes? ### Exact BookStack Version v23.05.2 ### Log Content _No response_ ### Hosting Environment Windows 2012 R2 Server

OVERLORD added the 🐕 Support label 2026-02-05 08:49:31 +03:00

OVERLORD closed this issue

2026-02-05 08:49:32 +03:00

OVERLORD commented

2026-02-05 08:49:36 +03:00

@ssddanbrown commented on GitHub (Jan 16, 2024):

Hi @EAwesomeK, please could you share the output of running git diff .env.example from your BookStack directory?

@ssddanbrown commented on GitHub (Jan 16, 2024): Hi @EAwesomeK, please could you share the output of running `git diff .env.example` from your BookStack directory?

OVERLORD commented

2026-02-05 08:49:37 +03:00

@EAwesomeK commented on GitHub (Jan 16, 2024):

diff --git a/.env.example b/.env.example
index a0a1b72e..1a37d96c 100644
--- a/.env.example
+++ b/.env.example
@@ -37,7 +37,7 @@ MAIL_FROM=bookstack@example.com
 # SMTP mail options
 # These settings can be checked using the "Send a Test Email"
 # feature found in the "Settings > Maintenance" area of the system.
-MAIL_HOST=localhost
+MAIL_HOST=192.168.0.132
 MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null

@EAwesomeK commented on GitHub (Jan 16, 2024): ```diff diff --git a/.env.example b/.env.example index a0a1b72e..1a37d96c 100644 --- a/.env.example +++ b/.env.example @@ -37,7 +37,7 @@ MAIL_FROM=bookstack@example.com # SMTP mail options # These settings can be checked using the "Send a Test Email" # feature found in the "Settings > Maintenance" area of the system. -MAIL_HOST=localhost +MAIL_HOST=192.168.0.132 MAIL_PORT=1025 MAIL_USERNAME=null MAIL_PASSWORD=null ```

OVERLORD commented

2026-02-05 08:49:41 +03:00

@ssddanbrown commented on GitHub (Jan 16, 2024):

Thanks for sharing @EAwesomeK.
That output does fairly clearly reflect that the file was modified.

You can just run git restore .env.example to undo any changes though, then re-attempt the update.

@ssddanbrown commented on GitHub (Jan 16, 2024): Thanks for sharing @EAwesomeK. That output does fairly clearly reflect that the file was modified. You can just run `git restore .env.example` to undo any changes though, then re-attempt the update.

OVERLORD commented

2026-02-05 08:49:43 +03:00

@EAwesomeK commented on GitHub (Jan 17, 2024):

Thanks - have no idea how it was changed, I;m the only one that maintains the system

It works now

@EAwesomeK commented on GitHub (Jan 17, 2024): Thanks - have no idea how it was changed, I;m the only one that maintains the system It works now

OVERLORD commented

2026-02-05 08:49:45 +03:00

@ssddanbrown commented on GitHub (Jan 17, 2024):

Good to hear things are working now! Will therefore close this off.

@ssddanbrown commented on GitHub (Jan 17, 2024): Good to hear things are working now! Will therefore close this off.

Sign in to join this conversation.

Branches Tags

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/BookStack#4408