Accessibility Tools

Skip to main content

Author: Carlota Conceição

We deploy a site with a custom workflow based on “git”. How can we merge ESR changes into our project?

ESR includes an export of the git history. Alongside the normal downloads (such as “civicrm-X.Y.Z-drupal.tar.gz” or “civicrm-X.Y.Z-wordpress.zip”), there is another file “civicrm-X.Y.Z-patchset.tar.gz”. The export is generated via “git format-patch”, and you can import with “git am /path/to/patch/files”. Of course, we can’t anticipate all the custom workflows out there. Fortunately, the patch-file format is versatile and supported by many tools.