please comment with
- bitcoin PR / merged-master commit hash
- notes about conflicts/resolution or things to keep track of
for Bitcoin PR bitcoin/bitcoin#24409
Not specifically related to this commit, but we need to update the PACKAGE_NAME
variable in file build_msvc/bitcoin_config.h.ini
.
It's currently set to
/* Define to the full name of this package. */
#define PACKAGE_NAME "Bitcoin Core"
Update: fixed in jamesdorfman/elements@c37b88c
for Bitcoin PR bitcoin/bitcoin#24451
Confirm with @delta1 -- your commit message says All conflicts in the locale translation files were resolved by taking the upstream version of the files.
. I want to confirm that by upstream, you mean bitcoin. If that is the case, then I agree with this solution.
for Bitcoin PR bitcoin/bitcoin#24451
Confirm with @delta1 -- your commit message says
All conflicts in the locale translation files were resolved by taking the upstream version of the files.
. I want to confirm that by upstream, you mean bitcoin. If that is the case, then I agree with this solution.
@jamesdorfman yes exactly
delta1/elements@eef2269for Bitcoin PR bitcoin/bitcoin#24343TODO: revisit failing test (I will do it when I'm done going through everything)Update: fixed in jamesdorfman/elements@2ab19eb