Skip to content

Latest commit

 

History

History
7 lines (6 loc) · 985 Bytes

FORK.md

File metadata and controls

7 lines (6 loc) · 985 Bytes

dol-lab fork of Event Organiser

  • upstream: wordpress.org release zips only, one commit per release ("Import Event Organiser X.Y.Z from wordpress.org"). The zip ships built assets (*.min.js, *-rtl.css, the version number) that stephenharris/Event-Organiser on GitHub lacks, so a git checkout of upstream does not run as installed by Composer.
  • develop: upstream plus our patches on top; Composer installs this branch (stephenharris/event-organiser: dev-develop).
  • New release: unzip it over upstream (replace classes css includes js languages lib templates and the top-level files the zip ships, keep dev files such as tests/), commit, then git rebase upstream on develop and force-push develop.
  • stephenharris/Event-Organiser on GitHub: read or cherry-pick from it, never merge it (its history is unrelated to the zip imports).
  • Once upstream ships our patches, develop equals upstream and the fork can be replaced by the wordpress.org package.