diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-09-29 19:14:56 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-09-29 19:15:00 +0200 |
| commit | 437b608df289c97fd88f1dd79bdc8359e1b1c5b1 (patch) | |
| tree | be9fca0d30301894d68ddf6fa3e0d416f630f61e /src/rpc/util.cpp | |
| parent | 291e363ce500e492475c4ccd189ea1d031c43613 (diff) | |
| parent | fad7281d7842f337932cf44e703fdd631230ddd6 (diff) | |
Merge bitcoin/bitcoin#26202: ci: Use remote pull/merge ref instead of local git merge
fad7281d7842f337932cf44e703fdd631230ddd6 ci: Use remote pull/merge ref instead of local git merge (MacroFake)
Pull request description:
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.
Fixes https://github.com/bitcoin/bitcoin/issues/26163
ACKs for top commit:
hebasto:
ACK fad7281d7842f337932cf44e703fdd631230ddd6, I regularly use the same commands locally.
Tree-SHA512: 0febbf5db8c1536e31b374a7599a92037ca814174809075f42c7c7c4e1daaab5b3df09cf82f2de0d1e847c41eb30e770daaf7a85287f5d8d43ebd642d1234d3c
Diffstat (limited to 'src/rpc/util.cpp')
0 files changed, 0 insertions, 0 deletions