diff options
| author | Parker Burnett <burnettparker@gmail.com> | 2022-07-11 17:27:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-11 20:27:49 -0400 |
| commit | 3503163a640cd19f1788a58ec5abb7a57ea53b2c (patch) | |
| tree | 1c6bb3b7b375818b9f5f91a094ed5b27d5a9f56f /docs/tutorial/merging.md | |
| parent | 54957f8735051610ba97d40467dd008fa1870ca2 (diff) | |
Adding Git information to tutorial (#862)
* Adding an intro to git with helpful commands for someone unfamiliar
with git.
Co-authored by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Adding an intro to git with helpful commands for someone unfamiliar
with git.
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* ovl_Obj_Y2lift decompiled (#856)
* ovl_Obj_Y2lift decompiled
* format
* pr review fixes
* clean up
Co-authored-by: SonicDcer <noreply@github.com>
* Formating files and moving contributing.md
Also fixes links.
* Adding an intro to git with helpful commands for someone unfamiliar
with git.
formating files too
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* pr fixes
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Alejandro Asenjo <96613413+sonicdcer@users.noreply.github.com>
Co-authored-by: SonicDcer <noreply@github.com>
Diffstat (limited to 'docs/tutorial/merging.md')
| -rw-r--r-- | docs/tutorial/merging.md | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/docs/tutorial/merging.md b/docs/tutorial/merging.md index 79e1386cc..b7745b509 100644 --- a/docs/tutorial/merging.md +++ b/docs/tutorial/merging.md @@ -3,7 +3,6 @@ - Up: [Contents](contents.md) - Previous: [Documenting](documenting.md) - ## Preparing to PR ### Change the `spec` @@ -73,7 +72,6 @@ Run the formatting script `format.sh`, to format the C files in the standard way To make sure the PR builds correctly with the current master, you need to merge `upstream/master` before you make the PR. This tends to break things, that you have to fix to get it to compile correctly again. - ## Pull Requests Push commits to your fork of the repository on GitHub, and then open a pull request. Name the PR something sensible, like @@ -87,7 +85,6 @@ and so on, although these four tend to cover most cases. Feel free to add a comm Please also update the status of the file on Trello/the spreadsheet. - ### Reviews Pull requests may be reviewed by anyone (who knows enough about the conventions of the project), and all must be reviewed and approved by two leads and one extra contributor. |