Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-18 00:51:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Clarify rule about merging upstream

Browse source
This commit is contained in:
Elias Fleckenstein 2021-10-25 19:56:03 +02:00
parent 5edf27ac88
commit 7f43ba6e36
No known key found for this signature in database
GPG key ID: 06927A5199D6C9B2
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CONTRIBUTING.md
View file

@ -145,7 +145,9 @@ problems, we ask you fix the issues as soon as possible.
* Fork the repository (in case you have not already) * Fork the repository (in case you have not already)
* Do your change in a new branch * Do your change in a new branch
* Create a pull request to get your changes merged into master * Create a pull request to get your changes merged into master
* Keep your pull request up to date by regulary merging upstream * Keep your pull request up to date by regulary merging upstream. It is
imperative that conflicts are resolved prior to merging the pull
request.
* After the pull request got merged, you can delete the branch * After the pull request got merged, you can delete the branch
### Git Guidelines ### Git Guidelines