From f22b3c80da086d7288669f3f267daf5f82d32020 Mon Sep 17 00:00:00 2001 From: michaelbirnstiehl Date: Mon, 5 Apr 2021 15:53:10 -0500 Subject: [PATCH] SONAR-14651 document new issue tracking behavior when using reference branch new code definition --- server/sonar-docs/src/pages/branches/branches-faq.md | 3 ++- server/sonar-docs/src/pages/branches/overview.md | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/sonar-docs/src/pages/branches/branches-faq.md b/server/sonar-docs/src/pages/branches/branches-faq.md index 6ce80bf71d5..c832df0409a 100644 --- a/server/sonar-docs/src/pages/branches/branches-faq.md +++ b/server/sonar-docs/src/pages/branches/branches-faq.md @@ -12,8 +12,9 @@ Branches will be deleted automatically when they are inactive according to your No, you don't need to be connected to a SCM. However, SCM data still enhances the SonarQube experience (including issue auto-assignment and issue backdating), and you will be well prepared to take advantage of [Pull Request Analysis](/analysis/pull-request/)! ## What if I mark an Issue "Won't Fix" or "False-Positive" in a branch? -It will be replicated as such when creating a Pull Request and merging the Pull Request into the master branch. +It will be replicated as such when creating a pull request and merging the pull request into the master branch. +If you're using the **Reference Branch** [New Code](/project-administration/new-code-period/) definition, issues in the reference branch that come from a feature branch automatically inherit their attributes (including "Won't Fix" and "False Positive" resolutions) from the feature branch. ## Can I manually delete a branch? You can delete a branch in the **Branches** tab at **Project Settings > Branches and Pull Requests**. diff --git a/server/sonar-docs/src/pages/branches/overview.md b/server/sonar-docs/src/pages/branches/overview.md index 1e8c9e221d2..e44a8bb9178 100644 --- a/server/sonar-docs/src/pages/branches/overview.md +++ b/server/sonar-docs/src/pages/branches/overview.md @@ -56,9 +56,11 @@ fi ### Issue Creation and Synchronization -During the first analysis, issues (type, severity, status, assignee, change log, comments) are synchronized with the Main Branch. In each synchronized issue, a comment is added to the change log of the issue on the branch: "The issue has been copied from branch 'master' to branch yyy". +During the first analysis, issues (type, severity, status, assignee, change log, comments) are synchronized with the Main Branch. In each synchronized issue, a comment is added to the change log of the issue on the branch: "The issue has been copied from branch 'master' to branch 'yyy'". -At each subsequent analysis of the branch, any new issue that comes from a pull request automatically inherits the attributes (type, severity, ...) the issue had in the pull request. A comment is added to the change log of the issue on the branch: "The issue has been merged from 'xxx' into 'yyy'" +At each subsequent analysis of the branch, any new issue in the Main Branch that comes from a pull request automatically inherits its attributes (type, severity, ...) from the pull request. A comment is added to the change log of the issue on the branch: "The issue has been merged from 'xxx' into 'yyy'" + +Issues can be synchronized between branches if you're using the **Reference Branch** [New Code](/project-administration/new-code-period/) definition. When using this New Code definition, any new issue in the reference branch that comes from a feature branch automatically inherits its attributes (type, severity, ...) from the feature branch. A comment is added to the change log of the issue on the branch: "The issue has been merged from 'xxx' into 'yyy'". ### Fetching full Git history -- 2.39.5