ci: should cause failures #32
Open
Conversation
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
PastaPastaPasta
force-pushed
the
comment-on-conflict
branch
from
5a445aa to
6ef833f
Compare
|
This pull request has conflicts, please rebase. |
PastaPastaPasta
force-pushed
the
should-conflict3
branch
from
fe706ff to
fcea341
Compare
PastaPastaPasta
force-pushed
the
should-conflict3
branch
from
fcea341 to
cc3bbaf
Compare
PastaPastaPasta
force-pushed
the
should-conflict3
branch
from
cc3bbaf to
cfb6624
Compare
PastaPastaPasta
force-pushed
the
comment-on-conflict
branch
from
5bdcde4 to
87df634
Compare
|
This pull request has conflicts, please rebase. |
PastaPastaPasta
changed the base branch from
comment-on-conflict
to
enhance-conflict-prediction-pr-comments
✅ No Merge Conflicts DetectedThis PR currently has no conflicts with other open PRs. |
PastaPastaPasta
force-pushed
the
enhance-conflict-prediction-pr-comments
branch
from
9fadf45 to
e0515b9
Compare
PastaPastaPasta
pushed a commit
that referenced
this pull request
Jul 29, 2025
a44caf65fe Merge bitcoin-core/univalue-subtree#28: Import fixes for sanitizer reported issues 135254331e Import fixes for sanitizer reported issues d5fb86940e refactor: use c++11 range based for loop in checkObject ff9c379304 refactor: Use nullptr (c++11) instead of NULL 08a99754d5 build: use ax_cxx_compile_stdcxx.m4 to check for C++11 support 66d3713ce7 Merge bitcoin-core/univalue-subtree#29: ci: travis -> cirrus 808d487292 ci: travis -> cirrus c390ac375f Merge bitcoin-core/univalue-subtree#19: Split sources for easier buildsystem integration 4a5b0a1c65 build: Move source entries out to sources.mk 6c7d94b33c build: cleanup wonky gen usage a222637c6d Merge #23: Merge changes from jgarzik/univalue@1ae6a23 98fadc0909 Merge #24: Push bool into array correctly 5f03f1f39a Push bool into array correctly f77d0f718d Merge commit '1ae6a231a0169938eb3972c1d48dd17cba5947e1' into HEAD 98261b1e7b Merge #22: Clamp JSON object depth to PHP limit 54c4015415 Clamp JSON object depth to PHP limit 5a58a46671 Merge #21: Remove hand-coded UniValue destructor. b4cdfc4f47 Remove hand-coded UniValue destructor. 1ae6a231a0 Merge pull request dashpay#57 from MarcoFalke/test_fix 92bdd11f0b univalue_write: remove unneeded sstream.h include ffb621c130 Merge pull request dashpay#56 from drodil/remove_sstream_header f33acf9fe8 Merge commit '7890db9~' into HEAD 7fba60b5ad Merge #17: [docs] Update readme 4577454e7e Merge #13: Fix typo 66e0adec4d Remove unnecessary sstream header from univalue.h ac7e73cda8 [docs] Update readme 7890db99d6 Merge #11: Remove deprecated std pair wrappers 88967f6586 Version 1.0.4 40e34852ac Merge #14: Cleaned up namespace imports to reduce symbol collisions 1dc113dbef Merge pull request dashpay#50 from luke-jr/pushKV_bool 72392fb227 [tests] test pushKV for boolean values c23132bcf4 Pushing boolean value to univalue correctly 4a4964729b Fix typo 85052a4819 Remove deprecated std::pair wrappers 81faab26a1 Merge pull request dashpay#48 from fwolfst/47-UPDATE_MIT_LINK_TO_HTTPS b17634ef24 Update URLs to MIT license. 51d3ab34ba Merge #10: Add pushKV(key, boolean) function (replaces #5) 129bad96d5 [tests] test pushKV for boolean values b3c44c947f Pushing boolean value to univalue correctly 07947ff2da Merge #9: [tests] Fix BOOST_CHECK_THROW macro ec849d9a28 [tests] Fix BOOST_CHECK_THROW macro 88ab64f6b5 Merge pull request dashpay#46 from jasonbcox/master 35ed96da31 Merge pull request dashpay#44 from MarcoFalke/Mf1709-univalue-cherrypick-explicit 420c226290 Merge pull request dashpay#45 from MarcoFalke/Mf1710-univalue-revert-test d208f986dd Cleaned up namespace imports to reduce symbol collisions 31bc9f5a49 Merge #8: Remove unused Homebrew workaround fa042093d1 Remove HomeBrew workaround a523e08ae4 Merge #7: Declare single-argument (non-converting) constructors "explicit" a9e53b38ba Merge #4: Pull upstream fe805ea74f Declare single-argument (non-converting) constructors "explicit" 8a2d6f1e36 Merge pull request #41 from jgarzik/get-obj-map ba341a20d7 Add getObjMap() helper method. Also, constify checkObject(). ceb1194137 Handle .pushKV() and .checkObject() edge cases. 107db98299 Add ::push_back(double) method for feature parity. d415300316 Move one-line implementation of UniValue::read() to header. 52e85b35b8 Move exception-throwing get_* methods into separate implementation module. dac5296759 README.md: update code quotes 3e31dcffbe README.md: close code quote d09b8429da Update README.md f1b86edb4c Convert README to markdown style. 1dfe464eff Import UniValue class unit tests from bitcoin project. 0d3e74dd1e operator[] takes size_t index parameter (versus unsigned int) 640158fa26 Private findKey() method becomes size_t clean, and returns bool on failure. 7099135857 Merge pull request #36 from ryanofsky/pr/end-str a31231b519 Version 1.0.3 4fd5444d18 Reject unterminated strings 81eba332b7 Merge pull request #26 from isle2983/pushBackHelpers 36405413e8 Merge PR #32 from branch 'nul-not-special' of git://github.com/ryanofsky/univalue into merge 89bb07322a Merge pull request #31 from ryanofsky/raw-literals 511008c36d Merge pull request #30 from ryanofsky/test-driver 77974f3a9f Merge pull request #34 from paveljanik/20161116_Wshadow_codepoint a38fcd3556 Do not shadow member variable codepoint. fd32d1ab85 Don't require nul-terminated string inputs 0bb1439d0d Support parsing raw literals in UniValue 28876d0455 Merge pull request #29 from btcdrak/exportspace 839ccd71f3 Add test driver for JSONTestSuite 26ef3fff15 Remove trailing whitespace from JSON export 16a1f7f6e9 Merge #3: Pull upstream 3f03bfd62b Merge pull request #27 from laanwj/2016_09_const_refs 5668ca397b Return const references from getKeys, getValues, get_str cedda1473d Merge pull request #28 from MarcoFalke/patch-1 9f0b997592 [travis] Work around osx libtool issue daf1285af6 Merge pull request #2 from jgarzik/master cfa0384d64 Convenience wrappers for push_back-ing integer types d9e62d3e19 Merge pull request #24 from MarcoFalke/Mf1608-cleanup faf260f2f8 Rem unused vars and prefer prefix operator for non-primitive type 09a2693ff1 Merge pull request #22 from laanwj/2016_04_unicode c74a04c259 Merge pull request #23 from paveljanik/20160527_Wshadow f32df99e96 Merge branch '2016_04_unicode' into bitcoin 280b191cb1 Merge remote-tracking branch 'jgarzik/master' into bitcoin fceb4f8e84 Do not shadow variables c9a716c2b9 Handle UTF-8 bed8dd9258 Version 1.0.2. 5e7985a3f8 Merge pull request #14 from laanwj/2015_11_escape_plan git-subtree-dir: src/univalue git-subtree-split: a44caf65fe55b9dd8ddb08f04c0f70409efd53b3
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.
No description provided.