From 39b614a03851fe35c3fa53caec845b564441bdb3 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Wed, 28 Jun 2023 20:27:55 +0100 Subject: [PATCH] Implement review feedback --- CONTRIBUTING.md | 10 ++++++---- CREDITS.md | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 83c514b35..781b1b85f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -222,10 +222,12 @@ they have made their donation Incognito). * Create a pull request to get your changes merged into master * It is important that conflicts are resolved prior to merging the pull request. -* We update our branches via rebasing. Please avoid unless it's the only -way you can resolve a conflict. We can rebase branches from the GUI if -the user has not merged master into the branch. -* After the pull request got merged, you can delete the branch +* We update our branches via rebasing. Please avoid merging master into +your branch unless it's the only way you can resolve a conflict. We can +rebase branches from the GUI if the user has not merged master into the +branch. +* After the pull request got merged, you can delete the branch if the +merger hasn't done this already. ### Discuss first If you feel like a problem needs to fixed or you want to make a new diff --git a/CREDITS.md b/CREDITS.md index bf546fedb..8be751e3e 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -159,6 +159,7 @@ * tobyplowy * epCode * Faerraven / Michieal +* SumianVoice ## Textures * XSSheep