Skip to content

Conversation

bittomhan
Copy link
Contributor

No description provided.

Copy link
Contributor

@bitschmidty bitschmidty left a comment

Choose a reason for hiding this comment

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

This is now a conflicting PR because of the changes required in the last newsletter recently merged. I suspect all of the other open PRs are conflicting for the same reason.

@bittomhan perhaps you can just include the files for each newsletter's PR and not the other newsletter files? Although there would be broken links for the newsletter that have not been merged yet.

Or perhaps we just have one open zh translation PR at a time? Or someone else has a suggestion.

@bittomhan
Copy link
Contributor Author

This is now a conflicting PR because of the changes required in the last newsletter recently merged. I suspect all of the other open PRs are conflicting for the same reason.

@bittomhan perhaps you can just include the files for each newsletter's PR and not the other newsletter files? Although there would be broken links for the newsletter that have not been merged yet.

Or perhaps we just have one open zh translation PR at a time? Or someone else has a suggestion.

I double checked this is one PR issue which affact all other PR.

I have already checked and fixed it. I will keep the zh translation PR in 5 newsletters.

Thank you for your help!

@bitschmidty bitschmidty force-pushed the 2020-08-19-newsletter-zh-111 branch from 4ac78a6 to 8432b50 Compare November 26, 2024 11:59
@bitschmidty
Copy link
Contributor

@bittomhan I used this approach to squash all the commits from this branch into one and also dropped the commit to change 110: https://stackoverflow.com/a/14885097

@bittomhan
Copy link
Contributor Author

@bittomhan I used this approach to squash all the commits from this branch into one and also dropped the commit to change 110: https://stackoverflow.com/a/14885097

Thank you and I used the command on local pc. It can be used to check the diff and I have already see that even I commit it there will be no change on the PR. So I know that it is OK.

Thank you!

@bitschmidty
Copy link
Contributor

@bittomhan I used this approach to squash all the commits from this branch into one and also dropped the commit to change 110: https://stackoverflow.com/a/14885097

Thank you and I used the command on local pc. It can be used to check the diff and I have already see that even I commit it there will be no change on the PR. So I know that it is OK.

Thank you!

Yes, but the idea is to have only commits related to the newsletter in the PR for: 1. simplicity and 2. not having to rebase if an earlier newsletter changes

Copy link
Contributor

@bitschmidty bitschmidty left a comment

Choose a reason for hiding this comment

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

ACK

@bitschmidty bitschmidty merged commit 81d8dd1 into bitcoinops:master Nov 27, 2024
2 checks passed
@bittomhan bittomhan deleted the 2020-08-19-newsletter-zh-111 branch November 27, 2024 11:26
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.

2 participants