fix: resolve merge conflicts in backport

[github-actions]

This is the main issue tracking #50

Please add labels indicating the release versions eg. 'version/v0'

Please add comments for user issues which this issue addresses.

Description copied from PR:

Related Issue

Addresses #5 (main issue)

Releases

none

Description

This will automatically resolve conflicts in backport PRs using the -X theirs strategy.
It adds risk to backport PRs, but allows the PRs to be created without fail.
In most cases this will be ok, but in the few instances where backports have merge conflicts we will ata least be able to see the problems in the review.

We will need to be extra careful to make sure that backports don't remove important lines of code.

Testing

actionlint