diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-09-29 13:43:06 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-11-01 12:52:04 +0000 |
| commit | b1268254bacabbd5e5c783dd06879ea96c327ad8 (patch) | |
| tree | cbc55a2662039bdb044ba8b8c88a3f63a661a273 /src/policy | |
| parent | c540f07ec3846b43f3af8a74820fd055ada5dfe5 (diff) | |
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
Diffstat (limited to 'src/policy')
0 files changed, 0 insertions, 0 deletions