Revert a commit from #5 to avoid merge conflict with bitcoin/bitcoin#22219 #41
Conversation
This file contains 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
This change allows to merge bitcoin/bitcoin#22219 without conflicts.
|
Tested ACK 498a318, a clean merge is possible after this. |
jarolrod
reviewed
Oct 3, 2021
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 (( |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.