Skip to content

Actions: k0sproject/k0s

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yaml
2,469 workflow run results
2,469 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Consolidate docs files around contributing Check for merge conflicts #2469: Pull request #5113 synchronize by twz123
October 28, 2024 14:28 14s
October 28, 2024 14:28 14s
Merge pull request #5144 from twz123/bump-runc Check for merge conflicts #2468: Commit fc957d1 pushed by twz123
October 28, 2024 14:24 2m 13s main
main
October 28, 2024 14:24 2m 13s
[Backport release-1.30] Bump runc to 1.1.15 Check for merge conflicts #2467: Pull request #5165 opened by twz123
October 28, 2024 14:21 2m 12s
October 28, 2024 14:21 2m 12s
Merge pull request #5159 from k0sproject/backport-5158-to-release-1.29 Check for merge conflicts #2466: Commit 022af50 pushed by twz123
October 28, 2024 14:10 2m 14s release-1.29
release-1.29
October 28, 2024 14:10 2m 14s
Merge pull request #5160 from k0sproject/backport-5158-to-release-1.30 Check for merge conflicts #2465: Commit 58968ad pushed by twz123
October 28, 2024 14:09 2m 13s release-1.30
release-1.30
October 28, 2024 14:09 2m 13s
Bump Go to v1.23.2 Check for merge conflicts #2464: Pull request #5155 synchronize by twz123
October 28, 2024 14:04 2m 12s
October 28, 2024 14:04 2m 12s
build(deps): bump pip from 24.2 to 24.3.1 in /docs Check for merge conflicts #2463: Pull request #5163 opened by dependabot bot
October 28, 2024 13:20 14s
October 28, 2024 13:20 14s
build(deps): bump mkdocs-macros-plugin from 1.3.6 to 1.3.7 in /docs in the mkdocs group Check for merge conflicts #2462: Pull request #5162 opened by dependabot bot
October 28, 2024 13:20 16s
October 28, 2024 13:20 16s
Merge pull request #5102 from twz123/reuse-reader Check for merge conflicts #2461: Commit 73dc7c8 pushed by twz123
October 28, 2024 13:05 2m 15s main
main
October 28, 2024 13:05 2m 15s
Merge pull request #5142 from twz123/backport-5094-to-release-1.31 Check for merge conflicts #2460: Commit ff7471b pushed by twz123
October 28, 2024 12:58 13s release-1.31
release-1.31
October 28, 2024 12:58 13s
Merge pull request #5112 from twz123/docs-move-arch-into-subfolder Check for merge conflicts #2459: Commit 5fe53a4 pushed by twz123
October 28, 2024 12:56 2m 14s main
main
October 28, 2024 12:56 2m 14s
Merge pull request #5111 from twz123/docs-ignore-custom-theme Check for merge conflicts #2458: Commit 8342b4d pushed by twz123
October 28, 2024 12:49 2m 11s main
main
October 28, 2024 12:49 2m 11s
[Backport release-1.30] Bump Go to v1.22.8 Check for merge conflicts #2457: Pull request #5160 opened by k0s-bot
October 28, 2024 10:45 12s
October 28, 2024 10:45 12s
[Backport release-1.29] Bump Go to v1.22.8 Check for merge conflicts #2456: Pull request #5159 opened by k0s-bot
October 28, 2024 10:45 12s
October 28, 2024 10:45 12s
Merge pull request #5158 from k0sproject/backport-5146-to-release-1.31 Check for merge conflicts #2455: Commit 6463b9c pushed by jnummelin
October 28, 2024 10:45 2m 15s release-1.31
release-1.31
October 28, 2024 10:45 2m 15s
Merge pull request #5141 from twz123/improve-retrywatcherrors-test Check for merge conflicts #2454: Commit f7a6fe3 pushed by twz123
October 28, 2024 09:08 2m 9s main
main
October 28, 2024 09:08 2m 9s
[Backport release-1.31] Bump Go to v1.22.8 Check for merge conflicts #2453: Pull request #5158 opened by k0s-bot
October 28, 2024 08:58 17s
October 28, 2024 08:58 17s
Merge pull request #5146 from twz123/bump-go Check for merge conflicts #2452: Commit 6666ae7 pushed by twz123
October 28, 2024 08:58 2m 16s main
main
October 28, 2024 08:58 2m 16s
build(deps): bump github.com/k0sproject/k0sctl from 0.19.0 to 0.19.2 in /hack/tool Check for merge conflicts #2451: Pull request #5157 opened by dependabot bot
October 25, 2024 13:53 2m 12s
October 25, 2024 13:53 2m 12s
Bump Go to v1.23.2 Check for merge conflicts #2450: Pull request #5155 synchronize by twz123
October 25, 2024 11:34 11s
October 25, 2024 11:34 11s
Bump Go to v1.23.2 Check for merge conflicts #2449: Pull request #5155 opened by twz123
October 25, 2024 10:43 12s
October 25, 2024 10:43 12s
build(deps): bump sigs.k8s.io/controller-runtime from 0.19.0 to 0.19.1 Check for merge conflicts #2448: Pull request #5154 opened by dependabot bot
October 24, 2024 13:47 13s
October 24, 2024 13:47 13s
Bump Kubernetes to v1.31.2 Check for merge conflicts #2447: Pull request #5153 opened by twz123
October 23, 2024 18:59 16s
October 23, 2024 18:59 16s
fix: join node creates new cluster when initial etcd sync config fails Check for merge conflicts #2446: Pull request #5151 opened by emosbaugh
October 23, 2024 13:56 12s
October 23, 2024 13:56 12s
build(deps): bump github.com/k0sproject/k0sctl from 0.19.0 to 0.19.1 in /hack/tool Check for merge conflicts #2445: Pull request #5150 opened by dependabot bot
October 23, 2024 13:56 14s
October 23, 2024 13:56 14s