Skip to content

Actions: k0sproject/k0s

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yaml
2,981 workflow runs
2,981 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Provide several sub-commands only on Linux Check for merge conflicts #2981: Pull request #5381 synchronize by twz123
December 24, 2024 14:13 14s
December 24, 2024 14:13 14s
Provide several sub-commands only on Linux Check for merge conflicts #2980: Pull request #5381 synchronize by twz123
December 24, 2024 14:02 10s
December 24, 2024 14:02 10s
Encapsulate debug flag handling Check for merge conflicts #2979: Pull request #5390 synchronize by twz123
December 24, 2024 13:54 9s
December 24, 2024 13:54 9s
Remove duplicate test Check for merge conflicts #2978: Pull request #5392 opened by twz123
December 24, 2024 13:52 11s
December 24, 2024 13:52 11s
Provide several sub-commands only on Linux Check for merge conflicts #2977: Pull request #5381 synchronize by twz123
December 24, 2024 13:45 13s
December 24, 2024 13:45 13s
Encapsulate debug flag handling Check for merge conflicts #2976: Pull request #5390 synchronize by twz123
December 24, 2024 13:35 10s
December 24, 2024 13:35 10s
Remove redundant logrus.SetOutput(stderr) statements Check for merge conflicts #2975: Pull request #5375 synchronize by twz123
December 24, 2024 13:24 14s
December 24, 2024 13:24 14s
Remove default-config and validate sub-commands Check for merge conflicts #2974: Pull request #5376 synchronize by twz123
December 24, 2024 13:22 2m 10s
December 24, 2024 13:22 2m 10s
Provide several sub-commands only on Linux Check for merge conflicts #2973: Pull request #5381 synchronize by twz123
December 24, 2024 13:19 9s
December 24, 2024 13:19 9s
Merge pull request #5383 from twz123/inttest-improvements Check for merge conflicts #2972: Commit 08c1af7 pushed by twz123
December 24, 2024 13:17 2m 15s main
main
December 24, 2024 13:17 2m 15s
Bump pymdown-extensions from 10.12 to 10.13 in /docs Check for merge conflicts #2971: Pull request #5391 opened by dependabot bot
December 24, 2024 13:09 11s
December 24, 2024 13:09 11s
Merge pull request #5382 from twz123/reject-unknown-sub-commands Check for merge conflicts #2970: Commit bdc33ec pushed by twz123
December 24, 2024 12:15 2m 20s main
main
December 24, 2024 12:15 2m 20s
Merge pull request #5386 from makhov/backport-5151-to-release-1.30 Check for merge conflicts #2969: Commit da250d3 pushed by makhov
December 24, 2024 11:51 2m 13s release-1.30
release-1.30
December 24, 2024 11:51 2m 13s
Merge pull request #5389 from makhov/backport-5151-to-release-1.29 Check for merge conflicts #2968: Commit 201d942 pushed by makhov
December 24, 2024 11:51 2m 10s release-1.29
release-1.29
December 24, 2024 11:51 2m 10s
Encapsulate debug flag handling Check for merge conflicts #2967: Pull request #5390 opened by twz123
December 24, 2024 11:09 2m 14s
December 24, 2024 11:09 2m 14s
Tweak and document disabling Docker build integration Check for merge conflicts #2966: Pull request #5365 synchronize by twz123
December 23, 2024 23:36 12s
December 23, 2024 23:36 12s
Merge pull request #5380 from twz123/main Check for merge conflicts #2965: Commit 670c115 pushed by twz123
December 23, 2024 23:27 2m 12s main
main
December 23, 2024 23:27 2m 12s
Merge pull request #5385 from k0sproject/backport-5151-to-release-1.31 Check for merge conflicts #2964: Commit 24b8b21 pushed by makhov
December 23, 2024 20:35 12s release-1.31
release-1.31
December 23, 2024 20:35 12s
[Backport release-1.29] Backport etcd join workflow fix from #5151 Check for merge conflicts #2963: Pull request #5389 opened by makhov
December 23, 2024 20:31 12s
December 23, 2024 20:31 12s
[Backport release-1.30] Backport etcd join workflow fix from #5151 Check for merge conflicts #2962: Pull request #5386 synchronize by makhov
December 23, 2024 13:26 14s
December 23, 2024 13:26 14s
Bump click from 8.1.7 to 8.1.8 in /docs Check for merge conflicts #2961: Pull request #5388 opened by dependabot bot
December 23, 2024 13:21 13s
December 23, 2024 13:21 13s
Bump jinja2 from 3.1.4 to 3.1.5 in /docs Check for merge conflicts #2960: Pull request #5387 opened by dependabot bot
December 23, 2024 13:21 10s
December 23, 2024 13:21 10s
[Backport release-1.30] Backport etcd join workflow fix from #5151 Check for merge conflicts #2959: Pull request #5386 opened by makhov
December 23, 2024 13:17 12s
December 23, 2024 13:17 12s
[Backport release-1.31] fix: join node creates new cluster when initial etcd sync config fails Check for merge conflicts #2958: Pull request #5385 opened by k0s-bot
December 23, 2024 13:01 10s
December 23, 2024 13:01 10s
Merge pull request #5151 from emosbaugh/issue-5149-etcd-creates-new-c… Check for merge conflicts #2957: Commit 3fdb4c5 pushed by juanluisvaladas
December 23, 2024 13:01 2m 16s main
main
December 23, 2024 13:01 2m 16s