variablelab/theatre
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update CONTRIBUTING.md with merge instructions (#164)

Browse source 
Update CONTRIBUTING.md
This commit is contained in:
Andrew Prifer 2022-05-16 12:57:19 +02:00 committed by GitHub
parent fc9df7c346
commit 2bdb535a28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CONTRIBUTING.md
View file

@ -273,3 +273,9 @@ convention for these branches should be:
- `(feature|hotfix|docs)/[identifier]` or
- an autogenerated branch name from a Github issue (On an issue without a PR,
look under the "Development" sidebar heading for a "create a branch link")
Squash & merge should be preferred most of the time to keep the main branch clean, unless the commit history is relevant, in which case rebase should be used.
Always update your feature branch with a rebase from the main branch to make sure that you don't accidentally break main with an undetected conflict.
Branches belonging to merged PRs should be deleted.