Skip to content

Actions: PHPCSStandards/PHP_CodeSniffer

Actions

Check PRs for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label-merge-conflicts.yml
1,312 workflow run results
1,312 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Modernize: use class constants for constant arrays (public API) Check PRs for merge conflicts #2441: Pull request #1043 opened by jrfnl
8s
8s
Handle \true/\false/\null in the new namespaced names tokenization Check PRs for merge conflicts #2440: Pull request #1042 opened by jrfnl
11s
11s
Merge branch 'master' into 4.x Check PRs for merge conflicts #2439: Commit 865a228 pushed by jrfnl
2m 57s 4.x
4.x
2m 57s
Merge pull request #1041 from PHPCSStandards/feature/bitwiseortest-fi… Check PRs for merge conflicts #2438: Commit 3cf8134 pushed by jrfnl
2m 9s master
master
2m 9s
BitwiseOrTest: fix up some test descriptions Check PRs for merge conflicts #2437: Pull request #1041 opened by jrfnl
11s
11s
Generic/UnnecessaryHeredoc: 2 bug fixes involving escape sequences Check PRs for merge conflicts #2436: Pull request #1040 opened by jrfnl
9s
9s
Squiz/VariableComment: make errorcode for "TagNotAllowed" warning modular Check PRs for merge conflicts #2435: Pull request #1039 opened by jrfnl
8s
8s
Merge pull request #1038 from PHPCSStandards/phpcs-4.0/feature/variou… Check PRs for merge conflicts #2434: Commit 66c2064 pushed by jrfnl
2m 22s 4.x
4.x
2m 22s
Tokens: fix docblocks Check PRs for merge conflicts #2433: Pull request #1038 opened by jrfnl
9s
9s
Merge branch 'master' into 4.x Check PRs for merge conflicts #2432: Commit caff6d3 pushed by jrfnl
2m 10s 4.x
4.x
2m 10s
Docs: various minor fixes (#1037) Check PRs for merge conflicts #2431: Commit 6292af2 pushed by jrfnl
2m 11s master
master
2m 11s
Docs: various minor fixes Check PRs for merge conflicts #2430: Pull request #1037 synchronize by jrfnl
11s
11s
Docs: various minor fixes Check PRs for merge conflicts #2429: Pull request #1037 opened by jrfnl
21s
21s
Merge branch 'master' into 4.x Check PRs for merge conflicts #2428: Commit 9d3f691 pushed by jrfnl
2m 55s 4.x
4.x
2m 55s
Merge pull request #1036 from PHPCSStandards/feature/966-generic-scop… Check PRs for merge conflicts #2427: Commit 1229916 pushed by jrfnl
2m 13s master
master
2m 13s
Generic/ScopeIndent: remove check for test constant from src code Check PRs for merge conflicts #2426: Pull request #1036 opened by jrfnl
10s
10s
Improve handling of disable/enable/ignore directives Check PRs for merge conflicts #2425: Pull request #123 synchronize by anomiex
11s
11s
Merge pull request #1035 from PHPCSStandards/phpcs-4.0/modernize/use-… Check PRs for merge conflicts #2424: Commit aab9cd6 pushed by jrfnl
12s 4.x
4.x
12s
Merge pull request #1034 from PHPCSStandards/phpcs-4.0/modernize/use-… Check PRs for merge conflicts #2423: Commit 4f0b383 pushed by jrfnl
2m 8s 4.x
4.x
2m 8s
Merge pull request #1033 from PHPCSStandards/phpcs-4.0/modernize/mess… Check PRs for merge conflicts #2422: Commit c341d74 pushed by jrfnl
2m 12s 4.x
4.x
2m 12s
Merge pull request #1032 from PHPCSStandards/phpcs-4.0/modernize/use-… Check PRs for merge conflicts #2421: Commit c41e13f pushed by jrfnl
2m 11s 4.x
4.x
2m 11s
Modernize: use PHP_OS_FAMILY constant Check PRs for merge conflicts #2420: Pull request #1035 opened by jrfnl
1m 52s
1m 52s
Modernize: static closures should be static Check PRs for merge conflicts #2419: Pull request #1034 opened by jrfnl
25s
25s
Modernize: use list in foreach Check PRs for merge conflicts #2418: Pull request #1033 opened by jrfnl
11s
11s
Modernize: use $levels parameter for dirname() Check PRs for merge conflicts #2417: Pull request #1032 opened by jrfnl
10s
10s