diff options
Diffstat (limited to 'docs/breaking_changes.md')
| -rw-r--r-- | docs/breaking_changes.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index b0d56a81b..a1a56bd45 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md | |||
| @@ -100,3 +100,7 @@ This happens immediately after the previous `develop` branch is merged. | |||
| 100 | * [ ] `git pull --ff-only` | 100 | * [ ] `git pull --ff-only` |
| 101 | * [ ] `git merge --no-ff develop` | 101 | * [ ] `git merge --no-ff develop` |
| 102 | * [ ] `git push upstream master` | 102 | * [ ] `git push upstream master` |
| 103 | |||
| 104 | ## Post-merge operations | ||
| 105 | |||
| 106 | * (Optional) [update ChibiOS + ChibiOS-Contrib on `develop`](chibios_upgrade_instructions.md) | ||