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
983 workflow run results
983 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #833 from PHPCSStandards/feature/squiz-embeddedphp… Check PRs for merge conflicts #1811: Commit f668a5b pushed by jrfnl
2m 17s master
master
2m 17s
Squiz/EmbeddedPhp: fix small typo in the reportEmptyTagSet() docblock Check PRs for merge conflicts #1810: Commit f0a9763 pushed by jrfnl
4m 19s 4.0
4.0
4m 19s
Merge pull request #837 from rodrigoprimo/fix-typo-embedded-php-sniff Check PRs for merge conflicts #1809: Commit 2f7ee70 pushed by jrfnl
2m 15s master
master
2m 15s
Squiz/EmbeddedPhp: fix small typo in the reportEmptyTagSet() docblock Check PRs for merge conflicts #1808: Pull request #837 opened by rodrigoprimo
19s
19s
Generators/[HTML|Markdown|Text]::getFormattedCodeComparisonBlock(): minor refactor Check PRs for merge conflicts #1807: Pull request #836 opened by jrfnl
53s
53s
Generators/Text::getFormattedTextBlock(): simplify the logic Check PRs for merge conflicts #1806: Commit 4d0f8c3 pushed by jrfnl
1m 42s 4.0
4.0
1m 42s
Merge pull request #824 from PHPCSStandards/feature/generators-text-v… Check PRs for merge conflicts #1805: Commit a97683d pushed by jrfnl
3m 51s master
master
3m 51s
Generators/HTML::getFormattedToc(): minor simplification Check PRs for merge conflicts #1804: Commit 5dd5a7e pushed by jrfnl
5m 36s 4.0
4.0
5m 36s
Merge pull request #823 from PHPCSStandards/feature/generator-html-va… Check PRs for merge conflicts #1803: Commit 2fa51a5 pushed by jrfnl
2m 13s master
master
2m 13s
Generic/DisallowShortOpenTag: prevent fixer conflict Check PRs for merge conflicts #1802: Pull request #835 opened by jrfnl
12s
12s
PHP 8.4 | Report final properties in File::getMemberProperties() Check PRs for merge conflicts #1801: Pull request #834 synchronize by DanielEScherzer
14s
14s
PHP 8.4 | Report final properties in File::getMemberProperties() Check PRs for merge conflicts #1800: Pull request #834 synchronize by DanielEScherzer
13s
13s
PHP 8.4 | Report final properties in File::getMemberProperties() Check PRs for merge conflicts #1799: Pull request #834 synchronize by DanielEScherzer
15s
15s
PHP 8.4 | Report final properties in File::getMemberProperties() Check PRs for merge conflicts #1798: Pull request #834 synchronize by DanielEScherzer
15s
15s
PHP 8.4 | Report final properties in File::getMemberProperties() Check PRs for merge conflicts #1797: Pull request #834 opened by DanielEScherzer
15s
15s
Squiz/EmbeddedPhp: bug fix - fixer conflict with itself Check PRs for merge conflicts #1796: Pull request #833 opened by jrfnl
1m 9s
1m 9s
Squiz/MemberVarSpacing: bug fix / improve parse error handling Check PRs for merge conflicts #1795: Pull request #832 opened by jrfnl
13s
13s
Squiz/MemberVarSpacing: allow for PHP 8.1+ readonly properties Check PRs for merge conflicts #1794: Commit 91a6039 pushed by jrfnl
3m 18s 4.0
4.0
3m 18s
Merge pull request #828 from PHPCSStandards/feature/squiz-membervarsp… Check PRs for merge conflicts #1793: Commit 894bf72 pushed by jrfnl
2m 15s master
master
2m 15s
PEAR/FunctionComment: bug fix - handling of blank lines in pre-amble Check PRs for merge conflicts #1792: Pull request #830 opened by jrfnl
12s
12s
Generic/ConstructorName: more defensive coding Check PRs for merge conflicts #1791: Commit 800f57c pushed by jrfnl
2m 14s 4.0
4.0
2m 14s
Merge pull request #814 from PHPCSStandards/feature/generic-construct… Check PRs for merge conflicts #1790: Commit ce20d6a pushed by jrfnl
2m 12s master
master
2m 12s
Generic/ConstructorName: more defensive coding / prevent fatal error Check PRs for merge conflicts #1789: Pull request #814 synchronize by jrfnl
2m 25s
2m 25s
PEAR/FunctionDeclaration: prevent fixer conflict for unfinished closu… Check PRs for merge conflicts #1788: Commit e8abd9f pushed by jrfnl
3m 12s 4.0
4.0
3m 12s
Merge pull request #827 from PHPCSStandards/feature/pear-functiondecl… Check PRs for merge conflicts #1787: Commit f947742 pushed by jrfnl
2m 12s master
master
2m 12s
ProTip! You can narrow down the results and go further in time using created:<2025-02-18 or the other filters available.