Commit 2c0b1263 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Add checking conflicts explanation

parent 541c732a
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,8 @@ This feature set is composed of tools to help generation of contribution documen


- [addTrackedChanges.py](https://forge.etsi.org/rep/cti/tools/-/blob/master/generateCR/addTrackedChanges.py?ref_type=heads) is in charge of converting the underlined and striked text in Word documents to tracked changes insertions and deletions respectively. It uses the Merge Request information to set the author and date of the changes.  
- [addTrackedChanges.py](https://forge.etsi.org/rep/cti/tools/-/blob/master/generateCR/addTrackedChanges.py?ref_type=heads) is in charge of converting the underlined and striked text in Word documents to tracked changes insertions and deletions respectively. It uses the Merge Request information to set the author and date of the changes.  


- [checking_conflicts.sh](https://forge.etsi.org/rep/cti/tools/-/blob/master/generateCR/checking_conflicts.sh?ref_type=heads) is in charge of checking potential conflicts with existing merge requests. It can be configured to check conflicts with merge requests that belong to the same milestone. It adds a label to the found conflicting merge requests and returns an error, which can be handled by the pipeline as desired (for instance, job raising a simple warning)  

All those scripts are dockerized into the same Docker image named [forge.etsi.org:5050/cti/tools/generatecr:master](https://forge.etsi.org/rep/cti/tools/container_registry/15)
All those scripts are dockerized into the same Docker image named [forge.etsi.org:5050/cti/tools/generatecr:master](https://forge.etsi.org/rep/cti/tools/container_registry/15)


# Generation of baseline documents (generateBaseline)
# Generation of baseline documents (generateBaseline)