Update version support documentation (#4990) (#4995)

Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 501ba8c) # Conflicts: # .github/pull_request_template.md # README.md # RELEASE_SUPPORT.md
eProsima · Jun 25, 2024 · ccd916a · ccd916a
1 parent 062f991
commit ccd916a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -21,7 +21,16 @@
     In case of bug fixes, please provide the list of supported branches where this fix should be also merged.
     Please uncomment following line, adjusting the corresponding target branches for the backport.
 -->
+<<<<<<< HEAD
 <!-- @Mergifyio backport 2.12.x 2.11.x 2.10.x 2.6.x -->
+=======
+<!-- @Mergifyio backport 2.13.x 2.10.x -->
+
+<!--
+    In case of critical bug fix, please uncomment following line, adjusting the corresponding LTS target branches for the backport.
+-->
+<!-- @Mergifyio backport 2.6.x -->
+>>>>>>> 501ba8c18 (Update version support documentation (#4990) (#4995))
 
 <!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
 <!-- Fixes #(issue) -->
@@ -54,5 +63,6 @@
 - [ ] The PR has a milestone assigned.
 - [ ] The title and description correctly express the PR's purpose.
 - [ ] Check contributor checklist is correct.
+- [ ] If this is a critical bug fix, backports to the critical-only supported branches have been requested.
 - [ ] Check CI results: changes do not issue any warning.
 - [ ] Check CI results: failing tests are unrelated with the changes.
diff --git a/README.md b/README.md
@@ -72,11 +72,14 @@ We are curious to get to know your use case!
 
 More information about the official support can be found [here](https://github.com/eProsima/Fast-DDS/blob/master/PLATFORM_SUPPORT.md#platform-support)
 
+<<<<<<< HEAD
 * Linux [![Linux ci](http://jenkins.eprosima.com:8080/job/nightly_fastdds_sec_master_linux/badge/icon?subject=%20%20%20Linux%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastdds_sec_master_linux)
 * Linux-aarch64 [![Linux arm64 ci](http://jenkins.eprosima.com:8080/job/nightly_fastdds_sec_master_linux_aarch64/badge/icon?subject=%20%20%20Linux-aarch64%20CI%20)](http://jenkins.eprosima.com:8080/view/Nightly/job/nightly_fastdds_sec_master_linux_aarch64/)
 * Windows [![Windows ci](http://jenkins.eprosima.com:8080/job/nightly_fastdds_sec_master_windows/label=windows-secure,platform=x64,toolset=v142/badge/icon?subject=%20%20%20%20Windows%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastdds_sec_master_windows/label=windows-secure,platform=x64,toolset=v142)
 * Mac [![Mac ci](http://jenkins.eprosima.com:8080/job/nightly_fastdds_sec_master_mac/badge/icon?subject=%20%20%20%20%20%20%20Mac%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastdds_sec_master_mac)
 
+=======
+>>>>>>> 501ba8c18 (Update version support documentation (#4990) (#4995))
 ## Installation Guide
 You can get either a binary distribution of *eprosima Fast DDS* or compile the library yourself from source.
 Please, refer to [Fast DDS documentation](https://fast-dds.docs.eprosima.com/en/latest/installation/binaries/binaries_linux.html) for the complete installation guide.

diff --git a/RELEASE_SUPPORT.md b/RELEASE_SUPPORT.md
@@ -1,6 +1,7 @@
 # Release support
 
 Please, refer to the [master branch](https://github.com/eProsima/Fast-DDS/blob/master/RELEASE_SUPPORT.md) for the latest version of this document.
+<<<<<<< HEAD
 
 *eProsima Fast DDS* maintains several releases with different support cycles.
 Major releases are scarce and they are made when public API is broken (more information about *eProsima Fast DDS* versioning can be found [here](https://github.com/eProsima/Fast-DDS/blob/master/VERSIONING.md)).
@@ -33,3 +34,5 @@ The table below outlines the *eProsima Fast DDS* minor releases and their suppor
 |v1.7.x|December 2018|February 2022|
 
 [^*]: Support may be extended.
+=======
+>>>>>>> 501ba8c18 (Update version support documentation (#4990) (#4995))