Detect Merge Conflicts · Workflow runs · DefectDojo/django-DefectDojo · GitHub

Actions

All workflows
Workflows
- .github/workflows/security-checks.yml .github/workflows/security-checks.yml
- .github/workflows/security-gateway.yml .github/workflows/security-gateway.yml
- Build Docker Images For Testing Build Docker Images For Testing
- Cancel outdated workflow runs Cancel outdated workflow runs
- ci ci
- Daily PR Review Reminder Daily PR Review Reminder
- Dependabot Updates Dependabot Updates
- Detect Merge Conflicts Detect Merge Conflicts
- Docs: Dry Run Production Deployment Docs: Dry Run Production Deployment
- Fetch OpenAPI Specifications Fetch OpenAPI Specifications
Management
- Caches
- Deployments

Detect Merge Conflicts

Actions

Loading...
Loading

detect-merge-conflicts.yaml

9,149 workflow runs

9,149 workflow runs

fix(helm/renovate/dependabot): Commit changes & fix condition format Detect Merge Conflicts #29898: Pull request #13695 opened by kiblik

14s kiblik:helm_fix_update_renovate

kiblik:helm_fix_update_renovate

14s

feat: add missing endpoint manager testing script Detect Merge Conflicts #29897: Pull request #13690 synchronize by codomposer

2m 10s codomposer:feat/test-endpoint-manager

codomposer:feat/test-endpoint-manager

2m 10s

feat: add missing endpoint manager testing script Detect Merge Conflicts #29896: Pull request #13690 synchronize by codomposer

8s

8s

reimport: support pro compute hash code method Detect Merge Conflicts #29895: Pull request #13680 synchronize by valentijnscholten

10s valentijnscholten:pro-hash-code-reimport-fix

valentijnscholten:pro-hash-code-reimport-fix

10s

reimport: support pro compute hash code method Detect Merge Conflicts #29894: Pull request #13680 synchronize by valentijnscholten

10s

10s

reimport: support pro compute hash code method Detect Merge Conflicts #29893: Pull request #13680 synchronize by valentijnscholten

2m 11s valentijnscholten:pro-hash-code-reimport-fix

valentijnscholten:pro-hash-code-reimport-fix

2m 11s

reimport: support pro compute hash code method Detect Merge Conflicts #29892: Pull request #13680 synchronize by valentijnscholten

2m 10s

2m 10s

feat(renovate): Wait 2 days to use latest k8s Detect Merge Conflicts #29891: Pull request #13694 opened by kiblik

8s kiblik:renovate_minimumReleaseAge_k8s

kiblik:renovate_minimumReleaseAge_k8s

8s

Update dependency kubernetes/kubernetes from v1.34.1 to v1.34.2 (.github/workflows/k8s-tests.yml) Detect Merge Conflicts #29890: Pull request #13693 opened by renovate bot

2m 14s renovate/kubernetes-kubernetes-1.34.x

renovate/kubernetes-kubernetes-1.34.x

2m 14s

chore(deps): bump boto3 from 1.40.69 to 1.40.71 Detect Merge Conflicts #29889: Pull request #13692 opened by dependabot bot

9s dependabot/pip/dev/boto3-1.40.71

dependabot/pip/dev/boto3-1.40.71

9s

chore(deps): bump vulners from 3.1.1 to 3.1.2 Detect Merge Conflicts #29888: Pull request #13691 opened by dependabot bot

2m 8s dependabot/pip/dev/vulners-3.1.2

dependabot/pip/dev/vulners-3.1.2

2m 8s

feat: add missing endpoint manager testing script Detect Merge Conflicts #29887: Pull request #13690 opened by codomposer

18m 53s codomposer:feat/test-endpoint-manager

codomposer:feat/test-endpoint-manager

18m 53s

docs: Update the API pull documentation Detect Merge Conflicts #29886: Pull request #13689 opened by sNiXx

12s sNiXx:api-docs-update

sNiXx:api-docs-update

12s

Update dependency node from 24.11.0 to v24.11.1 (.github/workflows/validate_docs_build.yml) Detect Merge Conflicts #29883: Pull request #13686 opened by renovate bot

8s renovate/node-24.11.x

renovate/node-24.11.x

8s

docs: Update DrHeader parser documentation Detect Merge Conflicts #29882: Pull request #13685 opened by skywalke34

10s skywalke34:update-drheader-docs

skywalke34:update-drheader-docs

10s

🎉 Add Kubeaudit fix_available field Detect Merge Conflicts #29881: Pull request #13684 opened by manuel-sommer

7s manuel-sommer:kubeaudit_fixavailable

manuel-sommer:kubeaudit_fixavailable

7s

Fix Duplicate Findings in Github SAST Scan by Improving Hash Code Detect Merge Conflicts #29880: Pull request #13683 opened by Logicmn

7s Logicmn:github-sast-hash-code

Logicmn:github-sast-hash-code

7s

reimport: support pro compute hash code method Detect Merge Conflicts #29879: Pull request #13680 synchronize by valentijnscholten

1m 53s valentijnscholten:pro-hash-code-reimport-fix

valentijnscholten:pro-hash-code-reimport-fix

1m 53s

reimport: support pro compute hash code method Detect Merge Conflicts #29878: Pull request #13680 synchronize by valentijnscholten

2m 5s

2m 5s

reimport: support pro compute hash code method Detect Merge Conflicts #29877: Pull request #13680 opened by valentijnscholten

5s valentijnscholten:pro-hash-code-reimport-fix

valentijnscholten:pro-hash-code-reimport-fix

5s

log a line when custom hash method is used Detect Merge Conflicts #29876: Pull request #13679 opened by valentijnscholten

12s valentijnscholten:log-custom-hash-method

valentijnscholten:log-custom-hash-method

12s

fix(helm): merge extraAnnotations with init job annotations Detect Merge Conflicts #29875: Pull request #13677 synchronize by qlimenoque

9s qlimenoque:fix/init-job-extra-annotations

qlimenoque:fix/init-job-extra-annotations

9s

fix(helm): merge extraAnnotations with init job annotations Detect Merge Conflicts #29874: Pull request #13677 synchronize by qlimenoque

8s

8s

fix(helm): merge extraAnnotations with init job annotations Detect Merge Conflicts #29873: Pull request #13677 synchronize by qlimenoque

11s qlimenoque:fix/init-job-extra-annotations

qlimenoque:fix/init-job-extra-annotations

11s

fix(helm): merge extraAnnotations with init job annotations Detect Merge Conflicts #29872: Pull request #13677 synchronize by qlimenoque

9s

9s