fix(key-wallet, dash-spv): re-emit late knowledge — record corrections, durable rescans, address-pool repair #2368
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: Merge Conflict Check | |
| on: | |
| push: | |
| branches: | |
| - main | |
| - dev | |
| pull_request_target: | |
| types: [opened, synchronize, reopened] | |
| jobs: | |
| conflict-check: | |
| runs-on: ubuntu-latest | |
| permissions: | |
| pull-requests: write | |
| steps: | |
| - name: Check for merge conflicts and label | |
| uses: eps1lon/actions-label-merge-conflict@v3 | |
| with: | |
| dirtyLabel: "merge-conflict" | |
| repoToken: "${{ secrets.GITHUB_TOKEN }}" | |
| commentOnDirty: "This PR has merge conflicts with the base branch. Please rebase or merge the base branch into your branch to resolve them." |