Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-09-22 08:04:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge is ugly but is confirmed working

Browse Source
This commit is contained in:
Oskar Weigl
2018-10-24 19:59:16 -07:00
parent 9e02d194f9
commit 7800d7cc9b
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/developer-guide.md
-1
View File
@@ -183,7 +183,6 @@ How to use these is shown in the following example.
* Make sure the rebase finishes, fixing any conflicts that may arise
### 4. Merge new STM32CubeMX code to your feature branch
**TODO: Nobody has done this yet, these instructions are new. Please verify that this works as intended.**
Simply merge the new state at `STM32CubeMX-end` into your feature branch.
* `git checkout your-feature`
* `git merge STM32CubeMX-end`