Skip to content

Newsletter 357 german #2358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

Walpurga03
Copy link
Contributor

No description provided.

@@ -171,4 +171,4 @@ für weitere Informationen zu Payjoin v2.
[multiprocess project]: https://github.com/ryanofsky/bitcoin/blob/pr/ipc/doc/design/multiprocess.md
[news320 ipc]: /en/newsletters/2024/09/13/#bitcoin-core-30509
[news264 payjoin]: /en/newsletters/2023/08/16/#serverless-payjoin
[news353 pr review]: /de/newsletters/2025/05/09/#bitcoin-core-pr-review-club
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have worked, what problem did you see?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed out of band, the source of the issue was identified as this feature branch having branched off from master before the German newsletter 353 had been merged which is why the link 404'd in the preview.

Copy link
Collaborator

@murchandamus murchandamus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, the build process failed because you are linking to a missing file. Our build pipeline is much more observant than I expected. 😁

I think the easiest fix would then be to merge upstream/master into this pull request.

Please let me know when you think this is ready for merge by changing the pull request from Draft to Ready for Review.

@Walpurga03 Walpurga03 force-pushed the newsletter-357-german branch from 150cd4d to d9bcb1a Compare June 9, 2025 18:24
@Walpurga03 Walpurga03 marked this pull request as ready for review June 9, 2025 20:19
@murchandamus
Copy link
Collaborator

murchandamus commented Jun 9, 2025

Irgendwie ist in diesem Force-push die Änderung von "Sicherheitserwägungen" zu "Sicherheitsabwägungen" zurückgenommen worden und es wird wieder auf den englischen Newsletter verlinkt.

Was ich vorschlagen wollte ist:

git fetch upstream                                  // holt den letzten Stand
git merge upstream/master                           // fügt alle Änderungen von upstream/master in dieses Branch ein, so dass Newsletter 353 jetzt vorhanden ist

Danach sollte der Link zum deutschen Newsletter funktionieren (da der Newsletter jetzt im gleichen Branch existiert). Die Änderung zu "Sicherheitsabwägungen" würde ich auch wieder einfügen. Wenn wir dann dieses Pull Request in den upstream/master mergen, ist es kein Problem, wenn die Änderungen hier in diesem Branch und auch schon auf upstream/master existieren.

@Walpurga03: Magst du das machen oder soll ich es machen?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants