Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backports php5.6 #1

Draft
wants to merge 23 commits into
base: master
Choose a base branch
from
Draft

Backports php5.6 #1

wants to merge 23 commits into from

Conversation

lode
Copy link
Member

@lode lode commented Apr 9, 2019

Do not merge into master. To use in Respondens, merge into release-editor.

This is a continuous PR backporting upstreams master to php5.

To bring up-to-date with upstream changes:

  • git fetch --all --prune
  • git checkout master
  • git merge upstream/master
  • git push
  • git checkout backports-php5.6
  • git merge master
  • You'll probably get conflicts, don't try to solve them, instead:
    • git checkout --theirs .
    • Do not commit, instead continue
  • Run the steps as documented in PHP5_TRANSPILATION.md
  • rm .php-cs-fixer.cache
  • ./vendor/bin/phpunit tests (don't proceed if there are failures which are not there on master)
  • git add .
  • git commit
  • git push

@lode lode mentioned this pull request Jun 19, 2019
lode and others added 3 commits August 31, 2021 15:26
…rser into backports-php5.6

� Conflicts:
�	src/BlockListener.php
�	src/Lexer.php
�	src/Line.php
�	src/listener/Blockquote.php
�	src/listener/Bold.php
�	src/listener/Color.php
�	src/listener/Heading.php
�	src/listener/Italic.php
�	src/listener/Link.php
�	src/listener/Lists.php
�	src/listener/Mention.php
�	src/listener/Strike.php
�	src/listener/Text.php
�	src/listener/Underline.php
�	src/listener/Video.php
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants