Fixes when merging in extraction

[James Bruten (james-bruten-mo)]

PR Summary

Sci/Tech Reviewer:
Code Reviewer: Erica Neininger (@ericaneininger)

This adds a commit when ignoring merge conflicts in the git extraction/merge code which is required when merging multiple branches. It also adds the option to specify the files/directories to ignore merge conflicts in via an environment variable. The default list is unchanged, except for the addition of the CONTRIBUTORS file.

Code Quality Checklist

• I have performed a self-review of my own code
• My code follows the project's style guidelines
• Comments have been included that aid understanding and enhance the readability of the code
• My changes generate no new warnings
• All automated checks in the CI pipeline have completed successfully

Testing

• This change has been tested appropriately (please describe)

This has been run using with a suite, using multiple conflicting branches. The conflicts are successfully ignored.

Security Considerations

• I have reviewed my changes for potential security issues
• Sensitive data is properly handled (if applicable)
• Authentication and authorisation are properly implemented (if applicable)

AI Assistance and Attribution

• Some of the content of this change has been produced with the assistance of Generative AI tool name (e.g., Met Office Github Copilot Enterprise, Github Copilot Personal, ChatGPT GPT-4, etc) and I have followed the Simulation Systems AI policy (including attribution labels)

Sci/Tech Review

• I understand this area of code and the changes being added
• The proposed changes correspond to the pull request description
• Documentation is sufficient (do documentation papers need updating)
• Sufficient testing has been completed

(Please alert the code reviewer via a tag when you have approved the SR)

Code Review

• All dependencies have been resolved
• Related Issues have been properly linked and addressed
• Code quality standards have been met
• Tests are adequate and have passed
• Security considerations have been addressed
• Performance impact is acceptable