Revert a commit from #5 to avoid merge conflict with bitcoin/bitcoin#22219#41
Merged
Merged
Conversation
This change allows to merge bitcoin/bitcoin#22219 without conflicts.
Contributor
|
Tested ACK 498a318, a clean merge is possible after this. |
jarolrod
reviewed
Oct 3, 2021
Contributor
jarolrod
left a comment
jarolrod
left a comment
There was a problem hiding this comment.
Post-merge ACK
I would like it if we can get some other opinions on the best way to deal with sync conflicts going forward.
Member
Author
Yeah. To workaround that merge conflict this PR and #48 are required. From my limited experience, the best way to deal with sync conflicts is to be a part of the main repo. Our changes in the build system are so huge, so bumping Qt version in the main repo will cause a merge conflict for sure (( |
johnny9
pushed a commit
to johnny9/bitcoin-core-app
that referenced
this pull request
Jul 4, 2025
… conflict with bitcoin/bitcoin#22219 482aab3 Revert 8efd330d54e75e4a5de36278299b5227e4e5bfdf (Hennadii Stepanov) Pull request description: This PR reverts the _"refactor: Move qwidget and qml common code into the main() function"_ commit (8efd330d54e75e4a5de36278299b5227e4e5bfdf) from #5, and it allows to sync with the main repo without a merge conflict with bitcoin/bitcoin#22219. ACKs for top commit: promag: Tested ACK 482aab3, a clean merge is possible after this. Tree-SHA512: b1d3708a20f36b81225a3c25963dbc32c3a33e54a795184cfea5b4af9c98ecd68cee8d297e94cced3f118aed738bafd4312536d62a445d09626d7fad613a2323
tx-signer450
added a commit
to tx-signer450/gui-qml
that referenced
this pull request
Oct 20, 2025
… conflict with bitcoin/bitcoin#22219 482aab3874cd9e9f4675e33154d9fc44a4c080f8 Revert 8efd330d54e75e4a5de36278299b5227e4e5bfdf (Hennadii Stepanov) Pull request description: This PR reverts the _"refactor: Move qwidget and qml common code into the main() function"_ commit (8efd330d54e75e4a5de36278299b5227e4e5bfdf) from #5, and it allows to sync with the main repo without a merge conflict with bitcoin/bitcoin#22219. ACKs for top commit: promag: Tested ACK 482aab3874cd9e9f4675e33154d9fc44a4c080f8, a clean merge is possible after this. Tree-SHA512: b1d3708a20f36b81225a3c25963dbc32c3a33e54a795184cfea5b4af9c98ecd68cee8d297e94cced3f118aed738bafd4312536d62a445d09626d7fad613a2323
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR reverts the "refactor: Move qwidget and qml common code into the main() function" commit (8efd330) from #5, and it allows to sync with the main repo without a merge conflict with bitcoin/bitcoin#22219.