arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-17 19:00:58 +00:00
Code Issues Releases Wiki Activity

docs: minor clarification of review process

Browse Source
This commit is contained in:
Martin Milata 2020-11-27 13:32:02 +01:00 committed by Pavol Rusnak
parent d8dd2f64a9
commit 76eb54b6f8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/misc/review.md
View File

@ -28,7 +28,9 @@
8. The author runs `git rebase -i [main branch] --autosquash` which squashes the fixup commits into 8. The author runs `git rebase -i [main branch] --autosquash` which squashes the fixup commits into
their respective parents and then force-pushes the rebase branch. their respective parents and then force-pushes the rebase branch.
9. The author makes a final check and merges the PR. If the rebase involved resolving some complicated 9. The author makes a final check and merges the PR. If the rebase involved resolving some complicated
merge conflicts, then the author may ask the reviewer for a final check. merge conflicts, then the author may ask the reviewer for a final check. GitHub's _Rebase and merge_
should be used, not _Squash and merge_.
10. The author deletes their branch.
## Example ## Example