How could we reduce conflicts when merging up?

Merging 1.12 branch to to 2.0 is currently a lot of trouble. Changelog and translations cause conflicts every single time. It is relatively easy to fix changelog with manual work. Translations however are impossible to fix.

Main reason is that translations are pulled down separately for each branch when doing a release. So they never match completely. The only way to clean up the merge is to remove language files from it completely. This is manual work and is error prone; When removing dozens of files it is easy to accidentally remove some file that was supposed to be merged.

What could we do to reduce the manual work?

The first idea that comes into mind is to remove translations from git and pull the translations from Transifex:

  • zip files: when generating the zip files.
  • composer: when running composer install/update
Feedback and Planning

Feedback and Planning

Discussions about the past, present, and future of Elgg and this community site.