This page is named backports because we do this more often than frontports, but it applies to pretty much all merges.
Some files are generated and thus, the modified code should not be merged, but rather re-generated for that branch.
Generated files should include a comment about how to generate the file
In general, generated files should not be managed by Git, but there are exceptions
List of generated files managed by Git
- https://gitlab.com/tikiwiki/tiki/-/blob/master/_PATH_DOCUMENTATION.md#generated-files
- https://gitlab.com/tikiwiki/tiki/-/blob/master/copyright.txt
- How to generate: see instructions in the file
Translations are a bit of a special case. See Creating or maintaining translations