Resolve conflicts

.github/ISSUE_TEMPLATE/testing-request.md

@@ -0,0 +1,60 @@
+---
+name: Testing request
+about: Request the QA team to perform testing related to development, code closure or any incorrect behavior, either manually or automatically.
+labels: status/not-tracked, team/qa
+assignees: ''
+
+---
+
+| Target version | Related issue | Related PR/dev branch |
+|---|---|---|
+|   |   |   |
+
+<!-- 
+Important: No section may be left blank. If not, delete it directly (in principle only "Configurations", "Current behavior" and "Considerations" could be left blank in case of not proceeding). 
+-->
+
+## Description
+<!-- 
+Description that contextualizes and shows the quality evaluator the cases that must be tested or investigated. 
+-->
+
+## Proposed checks
+<!-- 
+Indicate through a list of checkboxes the suggested checks to be carried out by the QA tester 
+-->
+
+- [ ] Check 1
+- [ ] Check 2
+.
+.
+.
+
+## Configuration and considerations
+<!--
+Indicate considerations to take into account when performing the testing that may not be very intuitive.
+
+If any configuration has to be applied, it should be indicated as far as possible.
+-->
+
+## Steps to reproduce
+<!--
+(DELETE SECTION IF NOT APPLICABLE) If the changes correspond to the fix of a bug or behavior, indicate the steps necessary to reproduce it before the fix.
+-->
+
+- Step 1
+- Step 2
+.
+.
+.
+
+## Current behavior
+<!-- 
+(DELETE SECTION IF NOT APPLICABLE) Indicate current results such as behaviors, logs, screenshots, etc. -->
+
+
+## Expected results
+<!-- 
+Indicate expected results such as behaviors, logs, screenshots, etc. 
+-->
+

.github/pull_request_template.md

@@ -1,37 +1,21 @@
-|Related issue|
-|-------------|
-|             |
+# Description
 
-## Description
-
-<!-- Add a description of the context and content of all changes made in the pull request -->
-
-<!-- Added functionalities or files. Remove if not applicable -->
-### Added
-
-- Item 1
-- Item n
-
-<!-- Changes made to existing functionality or files. Remove if not applicable -->
-### Updated
-
-- Item 1
-- Item n
-
-<!-- Functionalities or files that have been deleted. Remove if not applicable -->
-### Deleted
-
-- Item 1
-- Item n
+<!-- Add a brief description of the context and the approach applied in the pull request -->
 
 ---
 
 ## Testing performed
 
 <!-- At most there can only be this table. It must be updated if a new test has been performed. It is important to update the commit that has been tested! -->
-<!-- The developer only has to update his row. The same for the reviewer -->
-<!-- Reviewer has only to test in Jenkins -->
-| Tester             | Test path | Jenkins | Local  | OS | Commit | Notes                |
-|--------------------|-----------|---------|--------|-----|--------|----------------------|
-| @user (Developer)  |           | ⚫⚫⚫ | ⚫⚫⚫ |         |         | Nothing to highlight |
-| @user (Reviewer)   |           | ⚫⚫⚫ | :no_entry_sign: :no_entry_sign: :no_entry_sign:  |        |         | Nothing to highlight |
+<!-- Notes: 
+    - If you use a package, add its version, otherwise remove the section.
+    - If you add documentation or something that does not require running a test, remove the section.
+-->
+
+|OS|Package used|
+|--|--|
+|||
+
+| Validation | Jenkins | Local  | OS  | Commit | Notes                |
+|--------------------|-----------|---------|--------|-----|--------|
+|           | ⚫⚫ | ⚫⚫ |         |         | Nothing to highlight |