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,468 workflow run results
1,468 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #936 from PHPCSStandards/feature/squiz-functioncom… Check PRs for merge conflicts #2143: Commit 5349ce9 pushed by jrfnl
2m 52s master
master
2m 52s
PHP 8.2 | Generic/[Lower|Upper]CaseConstant: bug fix - ignore DNF pro… Check PRs for merge conflicts #2142: Commit 1084149 pushed by jrfnl
2m 18s 4.0
4.0
2m 18s
Merge pull request #934 from PHPCSStandards/feature/generic-lower-upp… Check PRs for merge conflicts #2141: Commit 3c90cda pushed by jrfnl
2m 22s master
master
2m 22s
Generic/ForbiddenFunctions: improve comment tolerance Check PRs for merge conflicts #2140: Commit 1b07f5d pushed by jrfnl
2m 8s 4.0
4.0
2m 8s
Merge pull request #929 from PHPCSStandards/feature/generic-forbidden… Check PRs for merge conflicts #2139: Commit dc1a497 pushed by jrfnl
2m 8s master
master
2m 8s
Generic/OpeningFunctionBraceKernighanRitchie: improve XML documentati… Check PRs for merge conflicts #2138: Commit 7be3761 pushed by jrfnl
2m 14s 4.0
4.0
2m 14s
Generic/OpeningFunctionBraceKernighanRitchie: improve XML documentati… Check PRs for merge conflicts #2137: Commit ef8ac39 pushed by jrfnl
2m 13s master
master
2m 13s
Generic/OpeningFunctionBraceKernighanRitchie: improve XML documentation Check PRs for merge conflicts #2136: Pull request #927 synchronize by rodrigoprimo
8s
8s
Squiz/FunctionSpacing: fix regression - only look at first docblock Check PRs for merge conflicts #2135: Pull request #946 opened by jrfnl
9s
9s
Squiz/FunctionComment: support DNF types Check PRs for merge conflicts #2134: Pull request #944 synchronize by devfrey
10s
10s
Squiz/FunctionComment: support DNF types Check PRs for merge conflicts #2133: Pull request #944 opened by devfrey
13s
13s
RecurseScopeMapDefaultKeywordConditionsTest: fix parameter name Check PRs for merge conflicts #2132: Commit 4b03364 pushed by jrfnl
2m 46s 4.0
4.0
2m 46s
Merge pull request #943 from PHPCSStandards/feature/recursescopemapde… Check PRs for merge conflicts #2131: Commit f281e46 pushed by jrfnl
2m 8s master
master
2m 8s
RecurseScopeMapDefaultKeywordConditionsTest: fix parameter name Check PRs for merge conflicts #2130: Pull request #943 opened by jrfnl
9s
9s
Tests/Tokenizer: use markers for the testSwitchDefault() test (#904) Check PRs for merge conflicts #2129: Commit f309147 pushed by jrfnl
2m 52s 4.0
4.0
2m 52s
Tests/Tokenizer: use markers for the testSwitchDefault() test (#904) Check PRs for merge conflicts #2128: Commit b2a9ea4 pushed by jrfnl
3m 17s master
master
3m 17s
TokenNameTest: ensure all polyfilled tokens are tested Check PRs for merge conflicts #2127: Commit 3d86d1b pushed by jrfnl
3m 39s 4.0
4.0
3m 39s
Merge pull request #942 from PHPCSStandards/feature/tokennametest-alw… Check PRs for merge conflicts #2126: Commit 52651d0 pushed by jrfnl
2m 9s master
master
2m 9s
TokenNameTest: ensure all polyfilled tokens are tested Check PRs for merge conflicts #2125: Pull request #942 synchronize by jrfnl
45s
45s
Squiz/OperatorBracket: stability tweak Check PRs for merge conflicts #2124: Commit 5529947 pushed by jrfnl
2m 42s 4.0
4.0
2m 42s
Merge pull request #941 from PHPCSStandards/feature/squiz-operatorbra… Check PRs for merge conflicts #2123: Commit 8dce54e pushed by jrfnl
2m 51s master
master
2m 51s
Tests/BackfillFnTokenTest: minor tweaks Check PRs for merge conflicts #2122: Commit 9e60cd5 pushed by jrfnl
2m 24s 4.0
4.0
2m 24s
Merge pull request #939 from PHPCSStandards/feature/backfillfntest-tweak Check PRs for merge conflicts #2121: Commit d231969 pushed by jrfnl
2m 19s master
master
2m 19s
ProcessRulesetBrokenRulesetTest: more tweaks for different libxml output Check PRs for merge conflicts #2120: Commit b6e4361 pushed by jrfnl
2m 56s 4.0
4.0
2m 56s
Merge pull request #935 from PHPCSStandards/feature/processbrokenrule… Check PRs for merge conflicts #2119: Commit aabfd5e pushed by jrfnl
2m 13s master
master
2m 13s
ProTip! You can narrow down the results and go further in time using created:<2025-04-07 or the other filters available.