Template:Additional tasks

📋 Additional tasks

Manage merge conflicts in version.php in backports

When backporting patches, sometimes the htdocs/lib/version.php will get merge conflicts because of a new DB upgrade step.

Solve the conflict:

1. Keep the set of code that matches to the version you're working with, e.g. in this case, the top section.
2. Increment the $config->version number by 1.
3. Copy the incremented version number and replace the last step in htdocs/lib/db/upgrade.php
4. Check that the new number is higher than the previous upgrade step.

In certain situations, $config->version number needs to be incremented and copied over the most latest DB upgrade steps, ensuring that it's later than the other DB upgrade steps.