Add git conflict finder to CI/CD pipeline#379
Merged
kara-mela merged 1 commit intopan-ontologies:masterfrom Apr 14, 2026
Merged
Add git conflict finder to CI/CD pipeline#379kara-mela merged 1 commit intopan-ontologies:masterfrom
kara-mela merged 1 commit intopan-ontologies:masterfrom
Conversation
Motivation: Robot's template command doesn't fail on git conflict markers, so we need another way of catching commits that mistaken include such markers. Modification: Include an additional check during the `validate` job of the build, to check that we don't have any such conflict markers. Result: Mistakenly including conflict markers in a commit now cause the CI/CD build to fail. Closes: pan-ontologies#378
kara-mela
approved these changes
Apr 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation:
Robot's template command doesn't fail on git conflict markers, so we need another way of catching commits that mistaken include such markers.
Modification:
Include an additional check during the
validatejob of the build, to check that we don't have any such conflict markers.Result:
Mistakenly including conflict markers in a commit now cause the CI/CD build to fail.
Closes: #378
Motivation
Modification
Result
Related Issues