You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
As we merged bitcoin 0.17 (#41) we are now going to merge 0.18 (#727). Merging bitcoin 0.17 happened a bit chaotic: #1013 (squash), #1038 (revert), #1039 (merge).
In general when merging anything the agreement is to squash-merge it using github. For upstream sync merges we do want to keep the upstream history though and perform a merge-merge. Also we manually squash the changes which we do on top of it (did not happen in #1039 but we would like to have it in #727).
Regarding the decision to revert: We had a tie in a quick poll we did, so we went with the default assumptions of never force pushing master.
Checklist
Squash changes we did on top
Merge-Merge the 0.18 branch
Adjust commit message to point to correct pull request, issues, and describe the nature of the merge commit
Re-enable (respectively disable) github repo configuration after merging
The text was updated successfully, but these errors were encountered:
Thanks for creating this. This is helpful. It might be nice to put it into a document, when we are done, so we can reuse it as a checklist for the next time.
As we merged bitcoin 0.17 (#41) we are now going to merge 0.18 (#727). Merging bitcoin 0.17 happened a bit chaotic: #1013 (squash), #1038 (revert), #1039 (merge).
In general when merging anything the agreement is to squash-merge it using github. For upstream sync merges we do want to keep the upstream history though and perform a merge-merge. Also we manually squash the changes which we do on top of it (did not happen in #1039 but we would like to have it in #727).
Regarding the decision to revert: We had a tie in a quick poll we did, so we went with the default assumptions of never force pushing master.
Checklist
The text was updated successfully, but these errors were encountered: