gistfile1.txt

[tyrael@Ferencs-MacBook-Pro-135 php-src.git (master ✗)]$ git pull --rebase
remote: Counting objects: 25, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
From https://git.php.net/repository/php-src
   6c47f50..6453483  master     -> origin/master
First, rewinding head to replay your work on top of it...
Applying: Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
Using index info to reconstruct a base tree...
M	NEWS
M	UPGRADING
M	main/streams/xp_socket.c
<stdin>:141: trailing whitespace.
		int *error_code, char *bindto, unsigned short bindport
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging main/streams/xp_socket.c
CONFLICT (content): Merge conflict in main/streams/xp_socket.c
Failed to merge in the changes.
Patch failed at 0001 Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
The copy of the patch that failed is found in:
   /Users/tyrael/checkouts/php-src.git/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".