[24.x] CI backports #26436

1. 
   hebasto commented at 12:57 PM on November 1, 2022: member

   This PR backports:

   • #26202
   • #26236

   to avoid CI failures like that:

   • https://cirrus-ci.com/task/5653459278495744
   • https://cirrus-ci.com/task/6075671743561728
2. ci: Use remote pull/merge ref instead of local git merge

   The merge strategy on the remote may be different than the local one.
   This may cause local merges to be different or fail completely. Fix this
   by using the result of the remote merge.
   
   Github-Pull: bitcoin/bitcoin#26202
   Rebased-From: fad7281d7842f337932cf44e703fdd631230ddd6

   b1268254ba
3. ci: Move `git config` commands into script where they are used

   Github-Pull: bitcoin/bitcoin#26236
   Rebased-From: ac1d99240af6c5d3ed5db2beea1479903d949a37

   14784aa02c
4. ci: Use same `merge_script` implementation for Windows as for all

   Github-Pull: bitcoin/bitcoin#26236
   Rebased-From: 37cf4720635b63cbe36a900a2411718704b63899

   7f2dc610a5
5. fanquake added this to the milestone 24.0 on Nov 1, 2022
6. fanquake approved
7. 
   fanquake commented at 5:06 PM on November 1, 2022: member

   ACK 7f2dc610a5ac68c915192bf5df5ad9e7177bf18e - backports look correct.

8. maflcko merged this on Nov 1, 2022
9. maflcko closed this on Nov 1, 2022

   ---

10. hebasto deleted the branch on Nov 2, 2022
11. bitcoin locked this on Nov 2, 2023

Milestone
24.0