# Trying to update an old staging instance getting errors about repo changes

**URL:** https://meta.discourse.org/t/trying-to-update-an-old-staging-instance-getting-errors-about-repo-changes/91717
**Category:** Support
**Created:** [7월 6, 2018, 2:30오후 UTC](https://meta.discourse.org/t/trying-to-update-an-old-staging-instance-getting-errors-about-repo-changes/91717 "2018-07-06T14:30:37Z")
**Posts on this page:** 6
**Page:** 1

<div class="post-metadata">

### Author: ![jerdog](https://sea3.discourse-cdn.com/meta/user_avatar/meta.discourse.org/jerdog/32/122843_2.png) [@jerdog](https://meta.discourse.org/u/jerdog)
#### Post date: [7월 6, 2018, 2:30오후 UTC](https://meta.discourse.org/t/trying-to-update-an-old-staging-instance-getting-errors-about-repo-changes/91717/1 "2018-07-06T14:30:38Z")

</div>

So I am in the process of upgrading an old staging instance so that I can do some testing of changes before rolling out to production, and when I run `./launcher rebuild app` it goes through the process of downloading latest image, etc. - and then it gives me these errors about doing `git pull` as part of the rebuild process:

```
$ ./launcher rebuild app
Ensuring launcher is up to date
Fetching origin
Updating Launcher
Updating 488fd91..c11d5b0
error: Your local changes to the following files would be overwritten by merge:
	discourse-setup
	image/base/Dockerfile
	image/base/install-gifsicle
	image/base/install-imagemagick
	image/base/install-nginx
	image/base/install-pngcrush
	image/base/install-pngquant
	image/discourse_dev/postgres_dev.template.yml
	image/discourse_fast_switch/Dockerfile
	image/discourse_fast_switch/create_switch.rb
	image/discourse_test/Dockerfile
	launcher
	samples/standalone.yml
	samples/web_only.yml
	templates/postgres.10.template.yml
	templates/postgres.9.5.template.yml
	templates/postgres.template.yml
	templates/web.ssl.template.yml
	templates/web.template.yml
Please, commit your changes or stash them before you can merge.
Aborting
failed to update

```

I have not changed these, and it looks like they’re all changes from the last time I did a rebuild. How should I proceed?

Edit: I admit I am not a great `git` master - so if there’s some git command I can run to force it to update just let me know.

---

<div class="post-metadata">

### Author: ![Stephen](https://sea3.discourse-cdn.com/meta/user_avatar/meta.discourse.org/stephen/32/95011_2.png) [@Stephen](https://meta.discourse.org/u/Stephen)
#### Post date: [7월 6, 2018, 2:59오후 UTC](https://meta.discourse.org/t/trying-to-update-an-old-staging-instance-getting-errors-about-repo-changes/91717/2 "2018-07-06T14:59:44Z")

</div>

You can manually ./git pull from within /var/discourse

---

<div class="post-metadata">

### Author: ![jerdog](https://sea3.discourse-cdn.com/meta/user_avatar/meta.discourse.org/jerdog/32/122843_2.png) [@jerdog](https://meta.discourse.org/u/jerdog)
#### Post date: [7월 6, 2018, 3:12오후 UTC](https://meta.discourse.org/t/trying-to-update-an-old-staging-instance-getting-errors-about-repo-changes/91717/3 "2018-07-06T15:12:04Z")

</div>

That is what the script is doing - and that’s the result I am getting whether I run the script or execute outside the script

---

<div class="post-metadata">

### Author: ![Falco](https://sea3.discourse-cdn.com/meta/user_avatar/meta.discourse.org/falco/32/179432_2.png) [@Falco](https://meta.discourse.org/u/Falco)
#### Post date: [7월 6, 2018, 3:46오후 UTC](https://meta.discourse.org/t/trying-to-update-an-old-staging-instance-getting-errors-about-repo-changes/91717/4 "2018-07-06T15:46:08Z")

</div>

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

```

---

<div class="post-metadata">

### Author: ![jerdog](https://sea3.discourse-cdn.com/meta/user_avatar/meta.discourse.org/jerdog/32/122843_2.png) [@jerdog](https://meta.discourse.org/u/jerdog)
#### Post date: [7월 6, 2018, 5:12오후 UTC](https://meta.discourse.org/t/trying-to-update-an-old-staging-instance-getting-errors-about-repo-changes/91717/5 "2018-07-06T17:12:44Z")

</div>

That’s what I was looking for. Thanks mate.

---

<div class="post-metadata">

### Author: ![system](https://sea3.discourse-cdn.com/meta/user_avatar/meta.discourse.org/system/32/443519_2.png) [@system](https://meta.discourse.org/u/system)
#### Post date: [8월 5, 2018, 5:12오후 UTC](https://meta.discourse.org/t/trying-to-update-an-old-staging-instance-getting-errors-about-repo-changes/91717/6 "2018-08-05T17:12:52Z")

</div>

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