From af0ed1dbb0817676bc9e3ec99d15c784169f2950 Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Thu, 16 Feb 2023 22:22:54 -0500 Subject: [PATCH] Fix some inaccuracies Removed line about bugfix only Removed line about merging to master branch because that's not how we have it set up at this repo. --- doc/CONTRIBUTING.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 1457dd391..24810c982 100644 --- a/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -1,5 +1,3 @@ -# Only bugfix are accepted - # Contributing to Bitburner ## In General @@ -156,7 +154,6 @@ upstream/master - Work in a new branch forked from the `dev` branch to isolate your new code. - Keep code-changes on a branch as small as possible. This makes it easier for code review. Each branch should be its own independent feature. - Regularly rebase your branch against `dev` to make sure you have the latest updates pulled. - - When merging, always merge your branch into `dev`. When releasing a new update, merge `dev` into `master`. ## Running locally