Testing: Add automated test to detect git merge conflict markers

cockroachdb / docs

CockroachDB user documentation

https://cockroachlabs.com/docs

Creative Commons Attribution 4.0 International

190 stars 460 forks source link

Testing: Add automated test to detect git merge conflict markers #2836

Open rmloveland opened 6 years ago

rmloveland commented 6 years ago

Richard Loveland (rmloveland) commented:

We should create an automated test to prevent PRs from being merged which contain git merge conflict markers, e.g.,

<<<<<<< HEAD

... stuff

=======

... stuff

>>>>>>> abc123...

Relates to #2832

Jira Issue: DOC-157

jseldess commented 2 years ago

We have closed this issue because it is more than 3 years old. If this issue is still relevant, please add a comment and re-open the issue. Thank you for your contribution to CockroachDB docs!

rmloveland commented 2 years ago

Def still valid AFAICT, see also #3301

exalate-issue-sync[bot] commented 2 years ago

Nick Vigilante (nickvigilante) commented: Definitely still relevant. I broke the docs site by leaving these in a sidebar JSON file 🤣

exalate-issue-sync[bot] commented 1 year ago

Nick Vigilante (nickvigilante) commented: What would be nice to have is a linter that wraps Vale and forces some style rules. Cloudflare does something for this in their docs: https://github.com/cloudflare/cloudflare-docs#development