<p>Based on <a href="https://stackoverflow.com/a/19216491/1417624">this</a> answer, you need the following procedure:</p>

<ol>
<li>Stash your local changes using <code>git stash</code></li>
<li>Pull from remote repository using <code>git pull</code></li>
<li>Merge your stashed configuration file using <code>git stash pop</code></li>
</ol>

<p>Of course, if there are changes in the <code>configuration.h</code> file on the remote repository and cause conflicts, you will need to resolve them, but it should be straight forward.</p>

CC BY-SA 3.0
2016-08-01T13:51:16.840Z
Thank you! I always wondered when to use stash - it seems like this would be an appropriate scenario.
Luke
CC BY-SA 3.0
2016-08-01T13:28:54.590Z
2016-08-01T13:28:54.590Z
2017-05-23T12:41:54.910Z
Demetris
<p>I cloned the Marlin repository and changed all my settings in <code>configuration.h</code> to match my old settings. Now when the RC branch gets updated, is there a way to upstream pull the changes without losing my settings?</p>

<marlin><reprap>
Cloning the Marlin git repo while keeping my configuration.h settings?
Luke
# Cloning the Marlin git repo while keeping my configuration.h settings?

(Asked by: username_0 on 2016-07-31)

I cloned the Marlin repository and changed all my settings in `configuration.h` to match my old settings. Now when the RC branch gets updated, is there a way to upstream pull the changes without losing my settings?

**Tags:** marlin, reprap

---

## 1 answers

### Answer by username_1 on 2016-08-01. Score: 6 | Accepted answer

Based on [this](https://stackoverflow.com/a/19216491/1417624) answer, you need the following procedure:

1. Stash your local changes using `git stash`
2. Pull from remote repository using `git pull`
3. Merge your stashed configuration file using `git stash pop`

Of course, if there are changes in the `configuration.h` file on the remote repository and cause conflicts, you will need to resolve them, but it should be straight forward.

> **Comments:**
> **username_0**: Thank you! I always wondered when to use stash - it seems like this would be an appropriate scenario.  

---

