Skip to content

Instantly share code, notes, and snippets.

@delta1

delta1/mergenotes.md

Created April 4, 2023 08:14
Show Gist options
  • Save delta1/32a8fc5e0e33c0aab657d2970e233a75 to your computer and use it in GitHub Desktop.
Save delta1/32a8fc5e0e33c0aab657d2970e233a75 to your computer and use it in GitHub Desktop.
Download ZIP
elements merging notes
Raw
mergenotes.md

merge notes for elements 24

please comment with

  • bitcoin PR / merged-master commit hash
  • notes about conflicts/resolution or things to keep track of
@jamesdorfman
Copy link

jamesdorfman commented Jul 20, 2023 •
edited

delta1/elements@51fbed1

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

@jamesdorfman
Copy link

delta1/elements@055d634

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.

@delta1
Copy link
Author

delta1 commented Jul 20, 2023

delta1/elements@055d634

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment