mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-22 02:21:06 +01:00
Implement review feedback
This commit is contained in:
parent
eded3b8dc4
commit
39b614a038
2 changed files with 7 additions and 4 deletions
|
@ -222,10 +222,12 @@ they have made their donation Incognito).
|
||||||
* Create a pull request to get your changes merged into master
|
* Create a pull request to get your changes merged into master
|
||||||
* It is important that conflicts are resolved prior to merging the pull
|
* It is important that conflicts are resolved prior to merging the pull
|
||||||
request.
|
request.
|
||||||
* We update our branches via rebasing. Please avoid unless it's the only
|
* We update our branches via rebasing. Please avoid merging master into
|
||||||
way you can resolve a conflict. We can rebase branches from the GUI if
|
your branch unless it's the only way you can resolve a conflict. We can
|
||||||
the user has not merged master into the branch.
|
rebase branches from the GUI if the user has not merged master into the
|
||||||
* After the pull request got merged, you can delete the branch
|
branch.
|
||||||
|
* After the pull request got merged, you can delete the branch if the
|
||||||
|
merger hasn't done this already.
|
||||||
|
|
||||||
### Discuss first
|
### Discuss first
|
||||||
If you feel like a problem needs to fixed or you want to make a new
|
If you feel like a problem needs to fixed or you want to make a new
|
||||||
|
|
|
@ -159,6 +159,7 @@
|
||||||
* tobyplowy
|
* tobyplowy
|
||||||
* epCode
|
* epCode
|
||||||
* Faerraven / Michieal
|
* Faerraven / Michieal
|
||||||
|
* SumianVoice
|
||||||
|
|
||||||
## Textures
|
## Textures
|
||||||
* XSSheep
|
* XSSheep
|
||||||
|
|
Loading…
Reference in a new issue