From dcbf40392801a7ab753e25dcc23248a2fe2669f7 Mon Sep 17 00:00:00 2001 From: philipportner Date: Thu, 10 Oct 2024 12:03:13 +0200 Subject: [PATCH] [doc] add comment about cleaner commits and resoving conflicts for PRs --- CONTRIBUTING.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d5113fab6..5e27ad91b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -79,9 +79,13 @@ That is, please try your best to make a good-quality contribution and we will he Please choose an expressive title and provide a short description of your changes. Feel free to mark your pull request "WIP: " or "Draft: " in the title. Note that you can add more commits to your pull request after you created it. -7. You **receive feedback** on your proposed contribution. + Ideally, the changes in the PR contain only the changes you made for that PR, + e.g, by rebasing your branch on top of the target branch. This makes it easier for others to + review your PR. +7. [Resolve any open conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts) to the target branch of the PR. +8. You **receive feedback** on your proposed contribution. You may be asked to apply certain changes, or we might apply straightforward adjustments ourselves before the integration. -8. If it looks good (potentially after some help), **your contribution becomes a part of DAPHNE**. +9. If it looks good (potentially after some help), **your contribution becomes a part of DAPHNE**. ### Experienced DAPHNE Contributors (Collaborators)