# About update error

**URL:** https://meta.discourse.org/t/about-update-error/386968
**Category:** Self-hosting
**Created:** [October 28, 2025, 5:16pm UTC](https://meta.discourse.org/t/about-update-error/386968 "2025-10-28T17:16:26Z")
**Posts on this page:** 2
**Page:** 1

<div class="post-metadata">

### Author: ![vivilonger](https://sea3.discourse-cdn.com/meta/user_avatar/meta.discourse.org/vivilonger/32/505721_2.png) [@vivilonger](https://meta.discourse.org/u/vivilonger)
#### Post date: [October 28, 2025, 5:16pm UTC](https://meta.discourse.org/t/about-update-error/386968/1 "2025-10-28T17:16:26Z")

</div>

error: Your local changes to the following files would be overwritten by merge:  
`.github/workflows/build.yml`  
`.github/workflows/push-web-only.yml`  
`.gitignore`  
image/auto\_build.rb  
image/base/Dockerfile  
image/discourse\_dev/Dockerfile  
samples/standalone.yml  
samples/web\_only.yml  
templates/postgres.template.yml  
templates/redis.template.yml  
templates/web.template.yml  
Please commit your changes or stash them before you merge.

How should this problem be solved?

---

<div class="post-metadata">

### Author: ![pfaffman](https://sea3.discourse-cdn.com/meta/user_avatar/meta.discourse.org/pfaffman/32/120154_2.png) [@pfaffman](https://meta.discourse.org/u/pfaffman)
#### Post date: [October 28, 2025, 6:15pm UTC](https://meta.discourse.org/t/about-update-error/386968/2 "2025-10-28T18:15:20Z")

</div>

I think maybe you want to

```plaintext
cd /var/discourse
git stash
git pull
./launcher rebuild app

```