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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1135 from PHPCSStandards/feature/squiz-functionde… Check PRs for merge conflicts #2684: Commit c43b854 pushed by jrfnl
2m 2s master
master
2m 2s
Merge branch 'master' into 4.x Check PRs for merge conflicts #2683: Commit 454dbd9 pushed by jrfnl
2m 21s 4.x
4.x
2m 21s
Merge pull request #1134 from PHPCSStandards/feature/update-license-c… Check PRs for merge conflicts #2682: Commit 47fdb33 pushed by jrfnl
4m 19s master
master
4m 19s
Various minor fixes / typos Check PRs for merge conflicts #2681: Pull request #1137 synchronize by jrfnl
1m 45s
1m 45s
Various minor fixes / typos Check PRs for merge conflicts #2680: Pull request #1137 opened by jrfnl
3m 9s
3m 9s
Squiz/FunctionDeclarationArgumentSpacing: fix typo in SpacingAfterVis[i]bility error code Check PRs for merge conflicts #2679: Pull request #1136 opened by jrfnl
5m 53s
5m 53s
Merge branch 'master' into 4.x Check PRs for merge conflicts #2678: Commit d5d7d2f pushed by jrfnl
7m 48s 4.x
4.x
7m 48s
Squiz/FunctionDeclarationArgumentSpacing: fix typo in SpacingAfterSetVis[i]bility error code Check PRs for merge conflicts #2677: Pull request #1135 synchronize by jrfnl
43s
43s
Squiz/FunctionDeclarationArgumentSpacing: fix typo in SpacingAfterSetVis[i]bility error code Check PRs for merge conflicts #2676: Pull request #1135 opened by jrfnl
23s
23s
Licence: update copyright Check PRs for merge conflicts #2675: Pull request #1134 opened by jrfnl
10s
10s
Merge pull request #1133 from rodrigoprimo/remove-outdated-code-from-… Check PRs for merge conflicts #2674: Commit 6739594 pushed by jrfnl
2m 8s master
master
2m 8s
Filter/Filter: remove outdated code that is no longer needed Check PRs for merge conflicts #2673: Pull request #1133 opened by rodrigoprimo
8s
8s
Squiz/SelfMemberReference: update XML doc Check PRs for merge conflicts #2672: Pull request #1108 synchronize by rodrigoprimo
8s
8s
Config: update version nr to next Check PRs for merge conflicts #2671: Commit ef0b6a6 pushed by jrfnl
2m 9s master
master
2m 9s
Merge branch 'master' into 4.x Check PRs for merge conflicts #2670: Commit 916b5af pushed by jrfnl
2m 10s 4.x
4.x
2m 10s
Merge pull request #1130 from PHPCSStandards/feature/update-gpg-key-info Check PRs for merge conflicts #2669: Commit 5b7cf79 pushed by jrfnl
2m 8s master
master
2m 8s
Update for new GPG keys Check PRs for merge conflicts #2668: Pull request #1130 synchronize by jrfnl
22s
22s
Update for new GPG keys Check PRs for merge conflicts #2667: Pull request #1130 opened by jrfnl
7s
7s
Merge pull request #1129 from PHPCSStandards/feature/changelog-3.13.1 Check PRs for merge conflicts #2666: Commit 1b71b4d pushed by jrfnl
2m 10s master
master
2m 10s
Changelog for the 3.13.1 release Check PRs for merge conflicts #2665: Pull request #1129 opened by jrfnl
9s
9s
Merge pull request #1128 from PHPCSStandards/feature/createtokenmap-b… Check PRs for merge conflicts #2664: Commit 025de13 pushed by jrfnl
2m 7s 4.x
4.x
2m 7s
Tokenizer/PHP: bug fix for missing parenthesis owner for method named "fn" Check PRs for merge conflicts #2663: Pull request #1128 opened by jrfnl
7s
7s
fix: Check that the result of pcntl_waitpid is the PID of a managed process Check PRs for merge conflicts #2662: Pull request #1126 synchronize by NanoSector
13s
13s
fix: Check that the result of pcntl_waitpid is the PID of a managed process Check PRs for merge conflicts #2661: Pull request #1126 synchronize by NanoSector
16s
16s
fix: Check that the result of pcntl_waitpid is the PID of a managed process Check PRs for merge conflicts #2660: Pull request #1126 synchronize by NanoSector
10s
10s