wassname/Open-Assistant
1
0
Fork 0
mirror of https://github.com/wassname/Open-Assistant.git synced 2026-09-12 12:03:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed nesting (#944)

Browse Source
This commit is contained in:
Seth
2023-01-27 23:38:40 +00:00
committed by GitHub
parent 0903ec5d58
commit cd3bb36db7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CONTRIBUTING.md
+6 -6
View File
@@ -50,12 +50,12 @@ contributions smoothly we recommend the following:
[Here](https://github.com/LAION-AI/Open-Assistant/pull/658) is an example PR [Here](https://github.com/LAION-AI/Open-Assistant/pull/658) is an example PR
for this project to illustrate this flow. for this project to illustrate this flow.
1. If you're lucky, we can merge your change into `main` without any problems. 1. If you're lucky, we can merge your change into `main` without any problems.
If there's changes to files you're working on, resolve them by: If there's changes to files you're working on, resolve them by :
1. First try rebase as suggested 1. First try rebase as suggested
[in these instructions](https://timwise.co.uk/2019/10/14/merge-vs-rebase/#should-you-rebase). [in these instructions](https://timwise.co.uk/2019/10/14/merge-vs-rebase/#should-you-rebase).
1. If rebase feels too painful, merge as suggested 1. If rebase feels too painful, merge as suggested
[in these instructions](https://timwise.co.uk/2019/10/14/merge-vs-rebase/#should-you-merge). [in these instructions](https://timwise.co.uk/2019/10/14/merge-vs-rebase/#should-you-merge).
1. Once you've resolved any conflicts, finish the review and 1. Once you've resolved conflicts (if any), finish the review and
[squash and merge](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits) [squash and merge](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits)
your PR (when squashing try to clean up or update the individual commit your PR (when squashing try to clean up or update the individual commit
messages to be one sensible single one). messages to be one sensible single one).