Add support for merge rebase

[malkovro]

Short description explaining the high-level reason for the pull request

Additions

Removals

Changes

Testing

Review

• @user

Preview this PR without the whitespace changes

Screenshots

Notes

Todos

Checklist

• Changes are limited to a single goal (no scope creep)
• Code can be automatically merged (no conflicts)
• Code follows the standards laid out in the front end playbook
• Passes all existing automated tests
• New functions include new tests
• New functions are documented (with a description, list of inputs, and expected output)
• Placeholder code is flagged
• Visually tested in supported browsers and devices
• Project documentation has been updated (including the "Unreleased" section of the CHANGELOG)