Commit 1eaf314cc8ff466b8630e448c2a4c38fa78db02f
1 parent
a7d0d216
Add note for preserving changes on development br
Showing
1 changed file
with
4 additions
and
0 deletions
.github/CONTRIBUTING.md
| @@ -35,6 +35,10 @@ git fetch upstream | @@ -35,6 +35,10 @@ git fetch upstream | ||
| 35 | ``` | 35 | ``` |
| 36 | git reset --hard upstream/development | 36 | git reset --hard upstream/development |
| 37 | ``` | 37 | ``` |
| 38 | +> If you have for some reason made changes to your development branch do a rebase pull to preserve them | ||
| 39 | +> ``` | ||
| 40 | +> git pull --rebase upstream/development | ||
| 41 | +> ``` | ||
| 38 | 5. Switch back to your feature branch | 42 | 5. Switch back to your feature branch |
| 39 | ``` | 43 | ``` |
| 40 | git checkout name-of-your-feature-branch | 44 | git checkout name-of-your-feature-branch |