From 0654910b77698adc48b60cbee6f6b6692fdc1c12 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 28 Mar 2020 12:28:20 -0400 Subject: [PATCH] Minor CONTRIBUTING.md update --- .github/CONTRIBUTING.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 89c61849e6..8d81ccf5c3 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -162,6 +162,11 @@ Whenever you make a change to a model schema that must be reflected in the datab You should now have MY/MS migration files generated in `/src/Tgstation.Server.Host/Models/Migrations +## Code Versioning + +Any backwards compatible fixes made should be committed to the `master` branch if possible. These will be automatically merged into the `dev` branch. +All other changes should be made directly to the `dev` branch. These will be merged to `master` on the next minor release cycle. + ## Deployment Process Every issue/pull request in a release should share a common milestone named with the release version i.e. `4.5.3.5`