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,887 workflow runs
1,887 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge branch 'master' into 4.x Check PRs for merge conflicts #2501: Commit 19d4bb8 pushed by jrfnl
2m 8s 4.x
4.x
2m 8s
Merge pull request #1065 from PHPCSStandards/feature/minor-cs-cleanup Check PRs for merge conflicts #2500: Commit 03359eb pushed by jrfnl
2m 25s master
master
2m 25s
Merge pull request #1066 from PHPCSStandards/phpcs-4.0/feature/standa… Check PRs for merge conflicts #2499: Commit c0271bd pushed by jrfnl
2m 12s 4.x
4.x
2m 12s
StandardRulesetsQATest: fix the test Check PRs for merge conflicts #2498: Pull request #1066 opened by jrfnl
13s
13s
CS: various array formatting fixes Check PRs for merge conflicts #2497: Pull request #1065 opened by jrfnl
8s
8s
Merge pull request #1064 from PHPCSStandards/phpcs-4.0/feature/report… Check PRs for merge conflicts #2496: Commit ddfd56a pushed by jrfnl
2m 11s 4.x
4.x
2m 11s
Merge pull request #1062 from PHPCSStandards/phpcs-4.0/feature/sq1612… Check PRs for merge conflicts #2495: Commit 3aa9c99 pushed by jrfnl
2m 12s 4.x
4.x
2m 12s
Reporter: remove redundant property Check PRs for merge conflicts #2494: Pull request #1064 synchronize by jrfnl
30s
30s
Runner: use StatusWriter for caught errors Check PRs for merge conflicts #2493: Pull request #1062 synchronize by jrfnl
9s
9s
Merge pull request #1056 from PHPCSStandards/phpcs-4.0/feature/remove… Check PRs for merge conflicts #2492: Commit 1ca08c5 pushed by jrfnl
2m 34s 4.x
4.x
2m 34s
Merge pull request #1055 from PHPCSStandards/phpcs-4.0/feature/remove… Check PRs for merge conflicts #2491: Commit 7b652df pushed by jrfnl
2m 8s 4.x
4.x
2m 8s
Merge pull request #1054 from PHPCSStandards/phpcs-4.0/feature/standa… Check PRs for merge conflicts #2490: Commit ad85819 pushed by jrfnl
2m 10s 4.x
4.x
2m 10s
Merge pull request #1052 from PHPCSStandards/phpcs-4.0/remove-output-… Check PRs for merge conflicts #2489: Commit a4a0ba4 pushed by jrfnl
2m 12s 4.x
4.x
2m 12s
Config: remove some more output buffering Check PRs for merge conflicts #2488: Pull request #1056 synchronize by jrfnl
33s
33s
Config: introduce prepareConfigDataForDisplay() method Check PRs for merge conflicts #2487: Pull request #1055 synchronize by jrfnl
38s
38s
Standards: introduce prepareInstalledStandardsForDisplay() method Check PRs for merge conflicts #2486: Pull request #1054 synchronize by jrfnl
1m 3s
1m 3s
Fixer: remove output buffering Check PRs for merge conflicts #2485: Pull request #1052 synchronize by jrfnl
37s
37s
Merge pull request #1051 from PHPCSStandards/phpcs-4.0/feature/consta… Check PRs for merge conflicts #2484: Commit d12e243 pushed by jrfnl
2m 9s 4.x
4.x
2m 9s
Merge pull request #1043 from PHPCSStandards/phpcs-4.0/feature/modern… Check PRs for merge conflicts #2483: Commit 75e9400 pushed by jrfnl
2m 9s 4.x
4.x
2m 9s
Modernize: add constant visibility Check PRs for merge conflicts #2482: Pull request #1051 synchronize by jrfnl
41s
41s
Modernize: use class constants for constant arrays (public API) Check PRs for merge conflicts #2481: Pull request #1043 synchronize by jrfnl
15s
15s
Merge pull request #1042 from PHPCSStandards/phpcs-4.0/feature/handle… Check PRs for merge conflicts #2480: Commit 8ee5e66 pushed by jrfnl
2m 9s 4.x
4.x
2m 9s
Handle \true/\false/\null in the new namespaced names tokenization Check PRs for merge conflicts #2479: Pull request #1042 synchronize by jrfnl
12s
12s
Merge pull request #1039 from PHPCSStandards/phpcs-4.0/feature/squiz-… Check PRs for merge conflicts #2478: Commit 570ce73 pushed by jrfnl
2m 10s 4.x
4.x
2m 10s
Handle \true/\false/\null in the new namespaced names tokenization Check PRs for merge conflicts #2477: Pull request #1042 synchronize by jrfnl
11s
11s
ProTip! You can narrow down the results and go further in time using created:<2025-04-29 or the other filters available.