After resetting the ElectrumABC github repository to its state just before the monorepo migration, then applying this patch, there should no longer be any conflicts caused by the "[electrum] initial monorepo integration" commit.
Details
Details
- Reviewers
Fabien - Group Reviewers
Restricted Project - Commits
- rABCc32efa17049f: [contrib] don't manage merge conflict in extract-electrum.sh
Run contrib/extract-electrum.sh and check that there is no conflict and all commits are applied.
Compare the content of ./electrum and ./electrumabc-mirror (e.g. meld ./electrum ./electrumabc-mirror)
Diff Detail
Diff Detail
- Repository
- rABC Bitcoin ABC
- Branch
- extract_electrum_no_conflict
- Lint
Lint Passed - Unit
No Test Coverage - Build Status
Buildable 24594 Build 48785: Build Diff Build 48784: arc lint + arc unit