This list seems to be high risk of, and trivial to reduce merge conflicts for.
(Refactor) QA: wallet_basic: Split wtx expected_fields over multiple lines to minimise merge conflicts #24293
pull luke-jr wants to merge 1 commits into bitcoin:master from luke-jr:qa_wtx_expected_fields_lines changing 1 files +13 −2-
luke-jr commented at 11:51 PM on February 8, 2022: member
-
QA: wallet_basic: Split wtx expected_fields over multiple lines to minimise merge conflicts de281eee0c
- DrahtBot added the label Tests on Feb 9, 2022
-
DrahtBot commented at 7:24 AM on February 9, 2022: member
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--174a7506f384e20aa4161008e828411d-->
Conflicts
Reviewers, this pull request conflicts with the following ones:
- #24198 (wallet, rpc: add wtxid in WalletTxToJSON by brunoerg)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
-
shaavan commented at 10:06 AM on February 9, 2022: contributor
I agree that expanding the list in multiple lines avoids the possible risk of merge conflicts.
But this section of code is not very actively edited by contributors. Specifically, this code section has been untouched since it was introduced two years ago.
Screenshot of Git Blame:

And at the time of writing this review, @DrahtBot is showing a single merge conflict (with #24198) for this PR.
So, considering the frequency with which this section is edited, would you still think this change deserves a separate PR of its own?
I think it would be better to add this commit along with #24198, as PR is already editing this section.
-
DrahtBot commented at 8:12 PM on March 8, 2022: member
<!--cf906140f33d8803c4a75a2196329ecb-->
🐙 This pull request conflicts with the target branch and needs rebase.
<sub>Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".</sub>
- DrahtBot added the label Needs rebase on Mar 8, 2022
-
fanquake commented at 1:15 PM on May 12, 2022: member
Closing for now. Feel free to rebase and reopen.
- fanquake closed this on May 12, 2022
- DrahtBot locked this on May 12, 2023