Thanks! Can you please undo your monolithic commit, and cherrypick the OPW's distinguishing commits? Afterwards, commit your additional change in a separate commit. This will help us review your additional change and prevent conflicts should the OPW get merged in upstream.
Mention the OPW in your merge proposal and give credit to its author by committing the cherrypicking merge using --author [author's emailaddress].
Does this bug affect 7.0? Your bug report seems to indicate it. Please clarify. Also link the OPW branch to the bug report.
Thanks! Can you please undo your monolithic commit, and cherrypick the OPW's distinguishing commits? Afterwards, commit your additional change in a separate commit. This will help us review your additional change and prevent conflicts should the OPW get merged in upstream.
Mention the OPW in your merge proposal and give credit to its author by committing the cherrypicking merge using --author [author's emailaddress].
Does this bug affect 7.0? Your bug report seems to indicate it. Please clarify. Also link the OPW branch to the bug report.