starred/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-02-12 03:09:38 +03:00
Code Issues 784 Packages Projects Releases 10 Wiki Activity

Can't update to lts version #3685

New Issue
Closed
opened 2026-02-05 07:12:01 +03:00 by OVERLORD · 0 comments
OVERLORD commented 2026-02-05 07:12:01 +03:00
Owner
Copy Link

Originally created by @Ludo-code on GitHub (Mar 24, 2023).

Describe the Bug

If i run git pull origin release he say me :

remote: Enumerating objects: 1671, done.
remote: Counting objects: 100% (1100/1100), done.
remote: Total 1671 (delta 1100), reused 1100 (delta 1100), pack-reused 571
Receiving objects: 100% (1671/1671), 1.61 MiB | 24.22 MiB/s, done.
Resolving deltas: 100% (1389/1389), completed with 492 local objects.
From https://github.com/BookStackApp/BookStack
 * branch              release    -> FETCH_HEAD
   e794c977..2dad92d1  release    -> origin/release
Updating e794c977..2dad92d1
error: Your local changes to the following files would be overwritten by merge:
        resources/lang/ar/settings.php
        resources/lang/ca/settings.php
        resources/lang/en/settings.php
        resources/lang/he/settings.php
        resources/lang/it/activities.php
        resources/lang/it/auth.php
        resources/lang/it/common.php
        resources/lang/it/components.php
        resources/lang/it/entities.php
        resources/lang/it/errors.php
        resources/lang/it/pagination.php
        resources/lang/it/passwords.php
        resources/lang/it/settings.php
        resources/lang/it/validation.php
        resources/lang/ko/settings.php
        resources/lang/ru/settings.php
        resources/lang/tr/settings.php
        resources/lang/zh_CN/settings.php
Please commit your changes or stash them before you merge.
Aborting

and doesn't update something...

Steps to Reproduce

try a git pull origin release in the BookStack v22.11.1 version...

Expected Behaviour

Update can be made...

Screenshots or Additional Context

No response

Browser Details

No response

Exact BookStack Version

v22.11.1

PHP Version

8.1

Hosting Environment

Ubuntu server 22.04.2

Originally created by @Ludo-code on GitHub (Mar 24, 2023). ### Describe the Bug If i run git pull origin release he say me : ``` remote: Enumerating objects: 1671, done. remote: Counting objects: 100% (1100/1100), done. remote: Total 1671 (delta 1100), reused 1100 (delta 1100), pack-reused 571 Receiving objects: 100% (1671/1671), 1.61 MiB | 24.22 MiB/s, done. Resolving deltas: 100% (1389/1389), completed with 492 local objects. From https://github.com/BookStackApp/BookStack * branch release -> FETCH_HEAD e794c977..2dad92d1 release -> origin/release Updating e794c977..2dad92d1 error: Your local changes to the following files would be overwritten by merge: resources/lang/ar/settings.php resources/lang/ca/settings.php resources/lang/en/settings.php resources/lang/he/settings.php resources/lang/it/activities.php resources/lang/it/auth.php resources/lang/it/common.php resources/lang/it/components.php resources/lang/it/entities.php resources/lang/it/errors.php resources/lang/it/pagination.php resources/lang/it/passwords.php resources/lang/it/settings.php resources/lang/it/validation.php resources/lang/ko/settings.php resources/lang/ru/settings.php resources/lang/tr/settings.php resources/lang/zh_CN/settings.php Please commit your changes or stash them before you merge. Aborting ``` and doesn't update something... ### Steps to Reproduce try a git pull origin release in the BookStack v22.11.1 version... ### Expected Behaviour Update can be made... ### Screenshots or Additional Context _No response_ ### Browser Details _No response_ ### Exact BookStack Version v22.11.1 ### PHP Version 8.1 ### Hosting Environment Ubuntu server 22.04.2
OVERLORD added the 🐕 Support label 2026-02-05 07:12:01 +03:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
🎨 Design
📖 Docs Update
🐛 Bug
🐛 Bug
:cat2:🐈 Possible duplicate
💿 Database
☕ Open to discussion
💻 Front-End
🐕 Support
🚪 Authentication
🌍 Translations
🔌 API Task
🏭 Back-End
⛲ Upstream
🔨 Feature Request
🛠️ Enhancement
🛠️ Enhancement
🛠️ Enhancement
❤️ Happy feedback
🔒 Security
🔍 Pending Validation
💆 UX
📝 WYSIWYG Editor
🌔 Out of scope
🔩 API Request
:octocat: Admin/Meta
🖌️ View Customization
❓ Question
🚀 Priority
🛡️ Blocked
🚚 Export System
♿ A11y
🔧 Maintenance
> Markdown Editor
pull-request
Mirrored from GitHub Pull Request
No Label 🐕 Support
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/BookStack#3685
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?