Unnamed: 0
int64
0
17.5k
id
stringlengths
20
73
name
stringclasses
816 values
default_branch
stringclasses
31 values
license
stringclasses
4 values
stargazers
int64
1.01k
125k
created_at
stringdate
2008-08-28 06:58:04
2024-04-02 04:09:47
topics
stringclasses
675 values
programming_language
stringclasses
3 values
scenario
stringlengths
236
990
sample_type
stringclasses
2 values
project_size
stringclasses
5 values
project_activity
stringclasses
2 values
difficulty
stringclasses
3 values
1,246
conan_io_conan_merge_0176
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': 'fd827f680ff8ab063426f040c905c8838827d334', 'parents': ['d78dd6cfd2ac3ad4afeef24c7cb3f3afbb5ec64a', '7b1096a555689449af5c7af9c75bb1a1a9e9a8ed'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/test/unittests/client/graph/version_ranges_graph_test.py', 'conans/test/unittests/client/tools/net_test.py']}
merge
medium
month
hard
1,247
conan_io_conan_merge_0177
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': '8a4ebc4d7f92421a201c9b41e331e85cc9e855cd', 'parents': ['76086ea7fb77fe890069458f2e07e342c4b94e74', 'd0bec577fa5491d00d793a8499ae49fd5c3307d2'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,248
conan_io_conan_merge_0178
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': '1afadb5cca9e1c688c7b37c69a0ff3c6a6dbe257', 'parents': ['7add301bed29787db357a3e87c88f84b4b794e9e', '4ba479c526ca5cec8ecdd1183041997a6e17cd45'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,249
conan_io_conan_merge_0179
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': '5ec52648de5bbb3694ed033d9771eba8fef9f992', 'parents': ['c4cc23e63d024b855e1871a23129acf67442b936', 'cca8d1d6fe5e5491b7715a3c89d5e3bc8ce2cba2'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
merge
medium
month
hard
1,250
conan_io_conan_merge_0180
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': '4f60952ca3091e1c7c263381da38afec16865a37', 'parents': ['5006e70c6530997eb820fab6ddc0e604a2c5ed18', '1c742e87f3fb292901a64f9af77c32a7df8ef1df'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,251
conan_io_conan_merge_0181
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': 'b25278d16d17369706c82906a1abd7778da3dd07', 'parents': ['fbfa9c0616255ce7cdd891c7410ab30cb72163b7', 'c3a6ed5dc7b5e27ac69191e36aa7592e47ce7759'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/client/tools/win.py']}
merge
medium
month
easy
1,252
conan_io_conan_merge_0182
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': 'dac34c4c1c19b94969f7b0d2aef44d0650285e3a', 'parents': ['f3ae040b978976ecec85a1614a2612b86a9cd2f4', '6cddf305a922d4adf752fb24388ddecf3b456c50'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,253
conan_io_conan_merge_0183
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': 'a4a428db0d92eeb5286055cd21b07df1573240bf', 'parents': ['f28f80161fa767718678ad5190627c5e41090a9b', 'ae495b1db9ec5e8ddc0d0b50562758ee3eca0516'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,254
conan_io_conan_merge_0184
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': 'f28f80161fa767718678ad5190627c5e41090a9b', 'parents': ['8f9f56496249247ec619d9e973b6b6a73031e433', '1287e6a4b458c9807a1a88af8f32be9be9b02b9b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,255
conan_io_conan_merge_0185
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': 'e4ae8c29cc268c0b505e6981be80735211b0c158', 'parents': ['2c86176d5ae5dfa46ea51c68df8b012d92ee935d', '0f66845e06e9f5b1141dd6fc15a74337a7c63c5f'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
merge
medium
month
hard
1,257
spring_cloud_spring_cloud_netflix_merge_0003
spring-cloud/spring-cloud-netflix
main
Apache License 2.0
4,845
2014-07-11T03:46:12
cloud-native;feign;java;microservices;netflix-eureka;netflix-hystrix;netflix-zuul;netflixoss;ribbon;spring;spring-boot;spring-cloud;spring-cloud-core
java
{'merge_commit_hash': '91ce95babe1d84b61335a37214b731ecbb57d1cf', 'parents': ['7bca5019f6dc69c89050ef612e19824843166f52', '153bf0ea6334d8c2d1f9b10f13b1b259ed3142ea'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java']}
merge
medium
month
easy
1,258
spring_cloud_spring_cloud_netflix_merge_0004
spring-cloud/spring-cloud-netflix
main
Apache License 2.0
4,845
2014-07-11T03:46:12
cloud-native;feign;java;microservices;netflix-eureka;netflix-hystrix;netflix-zuul;netflixoss;ribbon;spring;spring-boot;spring-cloud;spring-cloud-core
java
{'merge_commit_hash': '839a780e54ef39e42dd56e5a2b4457801ee172af', 'parents': ['99ebcfb79a9811ea1f71d2cc6246f01ee82c023f', 'ce82ea3b71dbeef41ce2926643ab73146336c96f'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java', 'spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java']}
merge
medium
month
hard
1,259
spring_cloud_spring_cloud_netflix_merge_0005
spring-cloud/spring-cloud-netflix
main
Apache License 2.0
4,845
2014-07-11T03:46:12
cloud-native;feign;java;microservices;netflix-eureka;netflix-hystrix;netflix-zuul;netflixoss;ribbon;spring;spring-boot;spring-cloud;spring-cloud-core
java
{'merge_commit_hash': 'c1352a81325f1ff1d49b83b601b4d8473d6459dc', 'parents': ['13337db454a42e52da6a26c0460a75c2c9380615', 'ce73a587f57a585e0376a3be5d218c357d496b45'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandler.java', 'spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandlerTests.java']}
merge
medium
month
hard
1,260
spring_cloud_spring_cloud_netflix_merge_0006
spring-cloud/spring-cloud-netflix
main
Apache License 2.0
4,845
2014-07-11T03:46:12
cloud-native;feign;java;microservices;netflix-eureka;netflix-hystrix;netflix-zuul;netflixoss;ribbon;spring;spring-boot;spring-cloud;spring-cloud-core
java
{'merge_commit_hash': '13337db454a42e52da6a26c0460a75c2c9380615', 'parents': ['658599f8106cdd2b8a8705002759df6e637fa7f7', '78ca251e964b92003209799f9a0da704f605172d'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandler.java', 'spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandlerTests.java']}
merge
medium
month
hard
1,261
rdflib_rdflib_file_commit_chain_0008
rdflib/rdflib
main
BSD 3-Clause New or Revised License
2,087
2012-02-03T05:49:13
graph;json-ld;linked-data;n3;namespace;nquads;ntriples;parser;pypi;python;python-library;rdf;rdf-xml;rdflib;semantic-web;serializer;sparql;turtle;turtle-rdf;uri
python
{'file': 'rdflib/Literal.py', 'branch': 'origin/bdbOptimized', 'times_seen_consecutively': 3, 'purity': 1.0, 'newest_commit': 'd2ce66dfbd0a11420f1c8487d4dd995a712622a3', 'oldest_commit': '50446d56d26607b72804e720eac462c0235e5d1e', 'contains_non_pl_files': False}
file_commit_chain
medium
month
easy
1,262
rdflib_rdflib_file_commit_chain_0009
rdflib/rdflib
main
BSD 3-Clause New or Revised License
2,087
2012-02-03T05:49:13
graph;json-ld;linked-data;n3;namespace;nquads;ntriples;parser;pypi;python;python-library;rdf;rdf-xml;rdflib;semantic-web;serializer;sparql;turtle;turtle-rdf;uri
python
{'file': 'rdflib/syntax/serializers/N3Serializer.py', 'branch': 'origin/bdbOptimized', 'times_seen_consecutively': 3, 'purity': 0.78, 'newest_commit': '682243a00dce4a22705496cc0a882dc9db52d82d', 'oldest_commit': '9dd3d2831dcf93a575f34273373c7d44ba7e2d3c', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,263
rdflib_rdflib_file_commit_chain_0010
rdflib/rdflib
main
BSD 3-Clause New or Revised License
2,087
2012-02-03T05:49:13
graph;json-ld;linked-data;n3;namespace;nquads;ntriples;parser;pypi;python;python-library;rdf;rdf-xml;rdflib;semantic-web;serializer;sparql;turtle;turtle-rdf;uri
python
{'file': 'rdflib/Graph.py', 'branch': 'origin/bdbOptimized', 'times_seen_consecutively': 3, 'purity': 0.71, 'newest_commit': '4759ae69c7020da719512b2cb6a3a513fad1ffa1', 'oldest_commit': '9cd6dcc6ef708030e2f503d376deedb832e3bad7', 'contains_non_pl_files': False}
file_commit_chain
medium
month
hard
1,264
rdflib_rdflib_file_commit_chain_0011
rdflib/rdflib
main
BSD 3-Clause New or Revised License
2,087
2012-02-03T05:49:13
graph;json-ld;linked-data;n3;namespace;nquads;ntriples;parser;pypi;python;python-library;rdf;rdf-xml;rdflib;semantic-web;serializer;sparql;turtle;turtle-rdf;uri
python
{'file': 'rdflib/Graph.py', 'branch': 'origin/bdbOptimized', 'times_seen_consecutively': 4, 'purity': 1.0, 'newest_commit': 'c6e54992583d85b8f87c2c832a6a66819a08c538', 'oldest_commit': 'ed76d76332b9f99156bde6f3cddaf2e05737ae1b', 'contains_non_pl_files': False}
file_commit_chain
medium
month
easy
1,265
rdflib_rdflib_file_commit_chain_0012
rdflib/rdflib
main
BSD 3-Clause New or Revised License
2,087
2012-02-03T05:49:13
graph;json-ld;linked-data;n3;namespace;nquads;ntriples;parser;pypi;python;python-library;rdf;rdf-xml;rdflib;semantic-web;serializer;sparql;turtle;turtle-rdf;uri
python
{'file': 'rdflib/sparql/QueryResult.py', 'branch': 'origin/bdbOptimized', 'times_seen_consecutively': 3, 'purity': 0.75, 'newest_commit': '28701e9c788b9ed8879fb7dc592ab532977fbf69', 'oldest_commit': '548d32ebd055943f351810f48299bb4204b1a98d', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,266
huggingface_optimum_merge_0001
huggingface/optimum
main
Apache License 2.0
2,163
2021-07-20T12:36:40
graphcore;habana;inference;intel;onnx;onnxruntime;optimization;pytorch;quantization;tflite;training;transformers
python
{'merge_commit_hash': 'a2bb748a82e8cdb949cb6c837d4b81fe12be42ab', 'parents': ['564a0c7877ab8a91b4c5595f0098b886c2e437b2', 'bb7b71a2c1f9c9220845b258afd88a5c1a24c013'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['optimum/exporters/onnx/__main__.py']}
merge
medium
month
easy
1,267
joblib_joblib_file_commit_chain_0000
joblib/joblib
main
BSD 3-Clause New or Revised License
3,691
2010-05-07T06:48:26
caching;memoization;multiprocessing;parallel-computing;python;threading
python
{'file': 'joblib/numpy_pickle.py', 'branch': 'main', 'times_seen_consecutively': 3, 'purity': 1.0, 'newest_commit': '36f08e5b9bdb318bcfcb49a41f44271c38558cb3', 'oldest_commit': '67fcbf1916c4382300e6fd88dca1ad664594251e', 'contains_non_pl_files': False}
file_commit_chain
medium
month
easy
1,268
joblib_joblib_file_commit_chain_0001
joblib/joblib
main
BSD 3-Clause New or Revised License
3,691
2010-05-07T06:48:26
caching;memoization;multiprocessing;parallel-computing;python;threading
python
{'file': 'joblib/test/test_format_stack.py', 'branch': 'main', 'times_seen_consecutively': 3, 'purity': 0.74, 'newest_commit': '6b98f4be4ec9b7bcf6d07432422ab50d353d52f8', 'oldest_commit': 'ee717708bb695575fae8c91e933912370ed39bca', 'contains_non_pl_files': False}
file_commit_chain
medium
month
hard
1,269
joblib_joblib_file_commit_chain_0002
joblib/joblib
main
BSD 3-Clause New or Revised License
3,691
2010-05-07T06:48:26
caching;memoization;multiprocessing;parallel-computing;python;threading
python
{'file': 'joblib/memory.py', 'branch': 'origin/0.4.X', 'times_seen_consecutively': 5, 'purity': 1.0, 'newest_commit': 'd74c429a3096b1e731454b3af76b54b3dbb1b23a', 'oldest_commit': '11e0e3800b7e6ef667589b48e8215625c528bb1b', 'contains_non_pl_files': False}
file_commit_chain
medium
month
easy
1,270
joblib_joblib_file_commit_chain_0003
joblib/joblib
main
BSD 3-Clause New or Revised License
3,691
2010-05-07T06:48:26
caching;memoization;multiprocessing;parallel-computing;python;threading
python
{'file': 'joblib/parallel.py', 'branch': 'origin/0.4.X', 'times_seen_consecutively': 3, 'purity': 0.78, 'newest_commit': '0050bb6a9b8cc3a1f34a7665d823f64cfa3ecf98', 'oldest_commit': 'd151fc84a54e443b5d2885b864bef949d538702a', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,271
joblib_joblib_file_commit_chain_0004
joblib/joblib
main
BSD 3-Clause New or Revised License
3,691
2010-05-07T06:48:26
caching;memoization;multiprocessing;parallel-computing;python;threading
python
{'file': 'joblib/numpy_pickle.py', 'branch': 'origin/0.5.X', 'times_seen_consecutively': 3, 'purity': 0.89, 'newest_commit': '933918edb55e1d47dfdca86d33943b55e997ead3', 'oldest_commit': 'ee90bb553109b24a5e06e31b5972f184ad50699a', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,272
dlr_rm_stable_baselines3_file_commit_chain_0000
dlr-rm/stable-baselines3
master
MIT License
8,096
2020-05-05T05:52:26
baselines;gsde;gym;machine-learning;openai;python;pytorch;reinforcement-learning;reinforcement-learning-algorithms;robotics;sb3;sde;stable-baselines;toolbox
python
{'file': 'stable_baselines3/common/env_checker.py', 'branch': 'origin/close_on_closed_check', 'times_seen_consecutively': 4, 'purity': 1.0, 'newest_commit': 'fc9b0672c9ee99654a32dd3c4ab24164f84e4602', 'oldest_commit': '30b3a368e35285e85cbb13aa92b50ef7806e8da8', 'contains_non_pl_files': False}
file_commit_chain
medium
month
easy
1,273
dlr_rm_stable_baselines3_file_commit_chain_0001
dlr-rm/stable-baselines3
master
MIT License
8,096
2020-05-05T05:52:26
baselines;gsde;gym;machine-learning;openai;python;pytorch;reinforcement-learning;reinforcement-learning-algorithms;robotics;sb3;sde;stable-baselines;toolbox
python
{'file': 'stable_baselines3/sac/sac.py', 'branch': 'origin/feat/crr', 'times_seen_consecutively': 4, 'purity': 0.79, 'newest_commit': '04c86286ada0b3b0152532845f4b572d8a0606b4', 'oldest_commit': '66f900ead9338449716f580ec061f806bf03a092', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,274
dlr_rm_stable_baselines3_file_commit_chain_0002
dlr-rm/stable-baselines3
master
MIT License
8,096
2020-05-05T05:52:26
baselines;gsde;gym;machine-learning;openai;python;pytorch;reinforcement-learning;reinforcement-learning-algorithms;robotics;sb3;sde;stable-baselines;toolbox
python
{'file': 'stable_baselines3/common/utils.py', 'branch': 'origin/feat/non-blocking', 'times_seen_consecutively': 5, 'purity': 0.5, 'newest_commit': '58b1e74abbbc7df16168151c5b8f690cafda3671', 'oldest_commit': '6b147d8cca54e525d960d6d076bc7bc30cb1c73f', 'contains_non_pl_files': False}
file_commit_chain
medium
month
hard
1,275
dlr_rm_stable_baselines3_merge_0002
dlr-rm/stable-baselines3
master
MIT License
8,096
2020-05-05T05:52:26
baselines;gsde;gym;machine-learning;openai;python;pytorch;reinforcement-learning;reinforcement-learning-algorithms;robotics;sb3;sde;stable-baselines;toolbox
python
{'merge_commit_hash': 'bf73f01ee943f44193e63c807bcd5d4ddd1092d9', 'parents': ['0345591deaa53e4240f4534fffe05f88e109cbb0', 'bea1e023bbcb29397ecd31636a2f9a0519680ab6'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['stable_baselines3/sac/policies.py', 'stable_baselines3/td3/policies.py']}
merge
medium
month
hard
1,276
netflix_consoleme_merge_0000
netflix/consoleme
master
Apache License 2.0
3,074
2019-11-13T03:21:01
aws;aws-iam;cloud-security;security-tools
python
{'merge_commit_hash': '24b3cda923e86c4dc5104835f00d8720d8fca1a5', 'parents': ['7932573a56ec179671e18e3f45a912eb9fd52501', '1182425476c0b29a640b6d72ed46f0e7beba3c74'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['consoleme/lib/aws.py']}
merge
medium
month
easy
1,277
lm_sys_FastChat_file_commit_chain_0001
lm-sys/FastChat
main
Apache License 2.0
34,842
2023-03-19T12:18:02
not available
python
{'file': 'fastchat/serve/monitor/monitor.py', 'branch': 'main', 'times_seen_consecutively': 4, 'purity': 1.0, 'newest_commit': 'a6c8d66746f5bbad17dd3291afd245acbcead739', 'oldest_commit': 'a7c99d11e32eeda3bbe48e11caf5aea702d319eb', 'contains_non_pl_files': False}
file_commit_chain
medium
month
easy
1,278
lm_sys_FastChat_file_commit_chain_0002
lm-sys/FastChat
main
Apache License 2.0
34,842
2023-03-19T12:18:02
not available
python
{'file': 'fastchat/serve/monitor/monitor_md.py', 'branch': 'main', 'times_seen_consecutively': 4, 'purity': 1.0, 'newest_commit': '3773213666d08a090aadceb7fb04732ddeb19c03', 'oldest_commit': '559fdc6a7cfac57aefa506ebc9158e08fe2883e0', 'contains_non_pl_files': False}
file_commit_chain
medium
month
easy
1,280
dfm_emcee_merge_0000
dfm/emcee
main
MIT License
1,424
2011-11-07T04:17:08
mcmc;mcmc-sampler;probabilistic-data-analysis;python
python
{'merge_commit_hash': '1feace943bc563a26c50d712a91ff7b9203a4bbc', 'parents': ['241c586fd54c31463f192346b1da7b4040c012f9', '9d042763c526de040a7226f511e3a730107f2e45'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['emcee/utils.py']}
merge
small
month
easy
1,281
ebean_orm_ebean_merge_0003
ebean-orm/ebean
master
Apache License 2.0
1,430
2012-09-13T11:49:56
cockroachdb;database;ebean;elasticsearch;h2;hana;java;jdbc;jpa;kotlin;mariadb;mysql;oracle;orm;postgres;sql;sqlite;sqlserver
java
{'merge_commit_hash': '34e267278e94e4cbc5f29573d40c8144b3557fac', 'parents': ['91c89746dea4a853c40699390d224fe3badacb78', '4610dbb26e1855a6c277a51988a75b1a05e5cbe9'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['ebean-api/src/main/java/io/ebean/ExpressionList.java']}
merge
large
month
easy
1,282
ebean_orm_ebean_merge_0004
ebean-orm/ebean
master
Apache License 2.0
1,430
2012-09-13T11:49:56
cockroachdb;database;ebean;elasticsearch;h2;hana;java;jdbc;jpa;kotlin;mariadb;mysql;oracle;orm;postgres;sql;sqlite;sqlserver
java
{'merge_commit_hash': '0e24e78e9c934c5cbef6d59f23ed69d0ea88aa85', 'parents': ['fc8bc93742f557a42c8845ce34f882ca0c823475', 'f0fd9003ada07705e126a4c3d709b78a812f0e9c'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java']}
merge
large
month
easy
1,283
ebean_orm_ebean_merge_0005
ebean-orm/ebean
master
Apache License 2.0
1,430
2012-09-13T11:49:56
cockroachdb;database;ebean;elasticsearch;h2;hana;java;jdbc;jpa;kotlin;mariadb;mysql;oracle;orm;postgres;sql;sqlite;sqlserver
java
{'merge_commit_hash': 'cd18675dba0e65afef90f5801e92d8a157818840', 'parents': ['67772b058e0b43ceea204a6805e0a34157558e91', '0e7abdd137d1268874909e32d8625f66b081de7d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['ebean-core/src/main/java/module-info.java']}
merge
large
month
easy
1,284
ebean_orm_ebean_merge_0006
ebean-orm/ebean
master
Apache License 2.0
1,430
2012-09-13T11:49:56
cockroachdb;database;ebean;elasticsearch;h2;hana;java;jdbc;jpa;kotlin;mariadb;mysql;oracle;orm;postgres;sql;sqlite;sqlserver
java
{'merge_commit_hash': '15b3eb2bf32afbf1a2e2f75d65bafd7cb10c4854', 'parents': ['f53c56490c65d121ea83b1c5276ff0afb2d8e4a7', 'ab45ad34e051622152b197b657cb39e560330a9a'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['ebean-api/src/main/java/io/ebean/Query.java', 'ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java', 'ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java', 'ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java']}
merge
large
month
hard
1,285
ebean_orm_ebean_merge_0007
ebean-orm/ebean
master
Apache License 2.0
1,430
2012-09-13T11:49:56
cockroachdb;database;ebean;elasticsearch;h2;hana;java;jdbc;jpa;kotlin;mariadb;mysql;oracle;orm;postgres;sql;sqlite;sqlserver
java
{'merge_commit_hash': 'f2afd11d6b23bdde7bd5664ff98e6e6144533b92', 'parents': ['f5e065313894deea1e685fa5caddb9324663bc9d', '0b2c016af23402abd614468d5a981c6ae76a6887'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java', 'ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java', 'ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java']}
merge
large
month
hard
1,286
iterative_dvc_file_commit_chain_0003
iterative/dvc
main
Apache License 2.0
13,221
2017-03-04T08:16:33
ai;collaboration;data-science;data-version-control;developer-tools;git;hacktoberfest;machine-learning;python;reproducibility
python
{'file': 'dvc/command/experiments/show.py', 'branch': 'main', 'times_seen_consecutively': 3, 'purity': 0.61, 'newest_commit': '0a4958bafd8797e5fe4a9c9fa189e857111facd6', 'oldest_commit': 'fc1ab7d3a13ed63a7e12598a26bdbc37f273faf6', 'contains_non_pl_files': False}
file_commit_chain
medium
month
hard
1,287
apache_shiro_file_commit_chain_0008
apache/shiro
main
Apache License 2.0
4,261
2009-08-29T08:00:17
java;library;shiro;web-framework
java
{'file': 'jsecurity/ri/web/src/org/jsecurity/ri/web/tags/PermissionTag.java', 'branch': 'origin/1.0.x', 'times_seen_consecutively': 3, 'purity': 0.96, 'newest_commit': '7c3e739df3a11b6a1a92b0d81ca95f58381ab194', 'oldest_commit': '62b4cd1eb1fc878590836c4540e277993b7c193b', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,288
apache_shiro_file_commit_chain_0009
apache/shiro
main
Apache License 2.0
4,261
2009-08-29T08:00:17
java;library;shiro;web-framework
java
{'file': 'jsecurity/ri/common/src/org/jsecurity/ri/authz/SimpleAuthorizationContext.java', 'branch': 'origin/1.0.x', 'times_seen_consecutively': 3, 'purity': 0.66, 'newest_commit': '56a089bd6ad92d4047b10c72416c7bda816394d1', 'oldest_commit': '810b401f60f34ee91a6d2f06e063461b561b7764', 'contains_non_pl_files': False}
file_commit_chain
medium
month
hard
1,289
apache_shiro_file_commit_chain_0010
apache/shiro
main
Apache License 2.0
4,261
2009-08-29T08:00:17
java;library;shiro;web-framework
java
{'file': 'core/src/main/java/org/apache/shiro/authz/aop/AuthorizingAnnotationMethodInterceptor.java', 'branch': 'origin/1.2.x', 'times_seen_consecutively': 4, 'purity': 1.0, 'newest_commit': '313fb5903dde88275dc8da92df40f329208a5368', 'oldest_commit': 'e235accd7139bf530e8d357aca26b3fe56ce6cea', 'contains_non_pl_files': False}
file_commit_chain
medium
month
easy
1,290
zalando_spilo_file_commit_chain_0000
zalando/spilo
master
Apache License 2.0
1,329
2015-04-17T01:22:42
data-infrastructure;docker;docker-image;high-availability;patroni;postgresql;python
python
{'file': 'postgres-appliance/scripts/configure_spilo.py', 'branch': 'master', 'times_seen_consecutively': 3, 'purity': 1.0, 'newest_commit': '246c3fe92f2c15eb5041cc5b191181a38398c344', 'oldest_commit': '5138179fd94bd5268d455a39c66ff5e6c1ef8a06', 'contains_non_pl_files': False}
file_commit_chain
small
month
easy
1,291
zalando_spilo_file_commit_chain_0001
zalando/spilo
master
Apache License 2.0
1,329
2015-04-17T01:22:42
data-infrastructure;docker;docker-image;high-availability;patroni;postgresql;python
python
{'file': 'postgres-appliance/major_upgrade/inplace_upgrade.py', 'branch': 'origin/docs_upgrade_script', 'times_seen_consecutively': 4, 'purity': 0.68, 'newest_commit': '342a2f0871b0a591b26645b9ca57a49f5be0553a', 'oldest_commit': 'ba6cd4b538962f7f2cb5e56f5373edd96506315a', 'contains_non_pl_files': False}
file_commit_chain
small
month
hard
1,292
zalando_spilo_file_commit_chain_0002
zalando/spilo
master
Apache License 2.0
1,329
2015-04-17T01:22:42
data-infrastructure;docker;docker-image;high-availability;patroni;postgresql;python
python
{'file': 'postgres-appliance/configure_spilo.py', 'branch': 'origin/feature/alpine', 'times_seen_consecutively': 5, 'purity': 0.5, 'newest_commit': '3476234f8a035d4974060822d0d3d4e076e75be4', 'oldest_commit': 'b7382e238f3603aa3c0596dca925bc1df8cd1e14', 'contains_non_pl_files': True, 'non_pl_files': ['postgres-appliance/Dockerfile']}
file_commit_chain
small
month
hard
1,293
zalando_spilo_merge_0000
zalando/spilo
master
Apache License 2.0
1,329
2015-04-17T01:22:42
data-infrastructure;docker;docker-image;high-availability;patroni;postgresql;python
python
{'merge_commit_hash': '9a9f6cdf9eec36b1c5f429895f37bbfc12af2bbf', 'parents': ['33fd81c6857f9af9a6b51e57ada3f1d489786ae0', 'f928d2051816696778afaea6fff1a129a8f21df9'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['postgres-appliance/configure_spilo.py']}
merge
small
month
easy
1,294
ethereum_web3_py_file_commit_chain_0000
ethereum/web3.py
main
MIT License
4,817
2016-04-14T03:59:35
not available
python
{'file': 'ens/main.py', 'branch': 'origin/v5', 'times_seen_consecutively': 3, 'purity': 0.78, 'newest_commit': '8078f6558c4758dcde454bc293059de275328bbe', 'oldest_commit': '0cf51a81dfe4d721e0db5440c4e37b335eb49934', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,295
ethereum_web3_py_file_commit_chain_0001
ethereum/web3.py
main
MIT License
4,817
2016-04-14T03:59:35
not available
python
{'file': 'tests/core/middleware/test_name_to_address_middleware.py', 'branch': 'origin/v6', 'times_seen_consecutively': 3, 'purity': 0.97, 'newest_commit': 'beba2db68ef745196c56c9780727c0b156a073af', 'oldest_commit': '24de40a1abca22be354c978505afd03d1d814646', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,296
ethereum_web3_py_file_commit_chain_0002
ethereum/web3.py
main
MIT License
4,817
2016-04-14T03:59:35
not available
python
{'file': 'ens/abis.py', 'branch': 'origin/v6', 'times_seen_consecutively': 3, 'purity': 0.98, 'newest_commit': '997911057fcea10fde3a665984ef5dfc1db504b3', 'oldest_commit': 'b7d525d19a3459ad7c6ec448d6e23c96d0dab2ed', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,298
ethereum_web3_py_merge_0001
ethereum/web3.py
main
MIT License
4,817
2016-04-14T03:59:35
not available
python
{'merge_commit_hash': '1284825f3ba2505656232fc9f0146188e17dfe9e', 'parents': ['c688e2aa28549be97cd5faee489e83d163f5765e', '00203622ab9068a1be460257609620b3235af0ff'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['web3/parity.py']}
merge
medium
month
easy
1,299
conan_io_conan_file_commit_chain_0000
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'file': 'conans/client/migrations_settings.py', 'branch': 'origin/develop', 'times_seen_consecutively': 3, 'purity': 0.95, 'newest_commit': '8a0bca67155f551cea47c688ed40fb741186f338', 'oldest_commit': '30569866f54d1a82b9000f7be30c7d27c104bf75', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,300
conan_io_conan_file_commit_chain_0001
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'file': 'conans/test/command/search_test.py', 'branch': 'origin/release/0.16.0', 'times_seen_consecutively': 4, 'purity': 0.65, 'newest_commit': '58334dadef7b58016ba62e7d6222199412ae6578', 'oldest_commit': '13e25424ff1858c233b6350d5a74f98ae2c942b6', 'contains_non_pl_files': False}
file_commit_chain
medium
month
hard
1,301
conan_io_conan_file_commit_chain_0002
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'file': 'conans/client/migrations_settings.py', 'branch': 'origin/release/1.25', 'times_seen_consecutively': 4, 'purity': 0.97, 'newest_commit': '663b37b4b1be40e6621160006b619343a5496505', 'oldest_commit': '33503fd1dfe3852b53d5c43bf71da9ec1971765f', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,302
conan_io_conan_file_commit_chain_0003
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'file': 'conans/client/migrations_settings.py', 'branch': 'origin/release/1.29', 'times_seen_consecutively': 3, 'purity': 0.91, 'newest_commit': 'f948afbd5423f601fe4a5646b979413764ceb2e1', 'oldest_commit': 'b417d0ab25afb1ff773893ebc0f9aa61bb27304a', 'contains_non_pl_files': False}
file_commit_chain
medium
month
medium
1,303
conan_io_conan_file_commit_chain_0004
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'file': 'conans/test/integration/toolchains/cmake/test_ninja.py', 'branch': 'origin/release/1.32', 'times_seen_consecutively': 3, 'purity': 1.0, 'newest_commit': 'b3083b8e1c75f5bb0d6453bbeef7f87493d0feae', 'oldest_commit': '13021f4c42d6231c5b8e0d2e8d9c1381cdab1364', 'contains_non_pl_files': False}
file_commit_chain
medium
month
easy
1,304
h2oai_h2ogpt_merge_0083
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': 'aa7b8e81a9b1c321d8f17633d99addafed2f2cce', 'parents': ['8b1f7a8d95633bf50b08bbe899352c73b89dee17', '871bb9c79151f6b2ce5385161ccab5f931b3f233'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,305
h2oai_h2ogpt_merge_0084
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': '8b1f7a8d95633bf50b08bbe899352c73b89dee17', 'parents': ['00141a10df0b44b6a6e4297813febf2255742201', '3a47ff36f9ba8441a8b8e4918d7ab2a45be9db01'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,306
reactor_reactor_netty_merge_0039
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': '2a7ab47055f9bf29bf9fdef47da5b7aafd2c385d', 'parents': ['fc82476f8304d55a2a25864cdd3c038eded41529', '94dbb20fc1dc095f2c57915150913f878d662097'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/test/java/reactor/netty/http/server/HttpSendFileTests.java']}
merge
medium
month
easy
1,307
reactor_reactor_netty_merge_0040
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': 'fc82476f8304d55a2a25864cdd3c038eded41529', 'parents': ['b52974c1a29fdb6bb8d67572861e70dedeefde40', 'b576b8761e61ebaaf0f885ff3088c9179ea2ac6e'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/reactor/netty/http/client/HttpClientOperations.java', 'src/test/java/reactor/netty/http/server/HttpSendFileTests.java']}
merge
medium
month
hard
1,308
reactor_reactor_netty_merge_0041
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': '875dd720c875a33c97054ac2d553bcba6677dda4', 'parents': ['66aa4a42285b76206cddd7e8f5ae83943ad09d3c', '6be19c16a05a972b0c1609b12eceff61cfb8e606'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/reactor/netty/http/client/HttpClientOperations.java']}
merge
medium
month
easy
1,309
reactor_reactor_netty_merge_0042
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': '473cfc9c0f7261813f05bf17ea3c68652ffbdb79', 'parents': ['7ac1f85491ed9e64e08d643e1e6ce41ef6a715d3', 'a86070c346bb1bc61de8760a5e1d2aa03f5787a9'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/reactor/netty/http/client/HttpClientOperations.java']}
merge
medium
month
easy
1,310
reactor_reactor_netty_merge_0043
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': 'b8ed32fe2e1470ca1a273aec939dfeb6184a8f34', 'parents': ['d0480d110462d13aaf397acd51ee874fd0bd82ae', 'c1c4c9ea35f10d30d446fc0e3fd5dc24fdf6a040'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/reactor/netty/http/client/HttpClientOperations.java']}
merge
medium
month
easy
1,311
reactor_reactor_netty_merge_0044
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': '2870dbea5f25e0e3c2b9154ad0b29889103bbf88', 'parents': ['8b419433d226359d241bb15c7f30fc9df8d6a5ee', '78fb6320c666ea58776bc1de0640cc3cda88f439'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/test/java/reactor/netty/udp/UdpClientTest.java']}
merge
medium
month
easy
1,312
reactor_reactor_netty_merge_0045
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': 'de6145f57dcf52bad88bbf9cb493f6619bfbe504', 'parents': ['69c404dcbca66b6818ea54002cd4bc4766374fd4', '504ffef035d0ac3a5396887c4af621ddc089bd3e'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['src/main/java/reactor/netty/http/client/HttpClientOperations.java', 'src/main/java/reactor/netty/http/server/HttpServerOperations.java', 'src/main/java/reactor/netty/http/server/WebsocketServerOperations.java']}
merge
medium
month
hard
1,313
reactor_reactor_netty_merge_0046
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': '69c404dcbca66b6818ea54002cd4bc4766374fd4', 'parents': ['72edb0f16d559a2cac6a1db29be0bdf4eae8ecb1', '3a5ede19e9a4721db81cf504646b72e57152face'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/reactor/netty/tcp/TcpResources.java']}
merge
medium
month
easy
1,314
reactor_reactor_netty_merge_0047
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': '905ddf8aaa50cb86ad9eb20f75c0d872278c9d78', 'parents': ['fec0c1e0f7ca6b1b343f2183eb6d837597e0de61', '8d0c7a43f192e8321a32e2fdb8ba6650f8161f52'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/reactor/netty/ByteBufFlux.java']}
merge
medium
month
easy
1,315
reactor_reactor_netty_merge_0048
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': 'fec0c1e0f7ca6b1b343f2183eb6d837597e0de61', 'parents': ['6dd2cd1b5562bb8447da66c28eb9d623c0d0172e', '2fff5768ccb312c050fda4460d07be8805a1dd7d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/reactor/netty/NettyOutbound.java']}
merge
medium
month
easy
1,316
h2oai_h2ogpt_merge_0085
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': 'd094bf746abf98da157384c0526dfb1d78a4ce7c', 'parents': ['8738cad13dff1e45d026ab9274fa00d3b9c8a9c6', 'b5c7f8f90fabb6deffe0e7fe2f5eb8020d82d401'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,317
h2oai_h2ogpt_merge_0086
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': '8738cad13dff1e45d026ab9274fa00d3b9c8a9c6', 'parents': ['62aaecd4655f452aedcdbd6fa5a04e1591596b7a', 'd2a23fb7f6eebfeab84a4479c02338e5707e089a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,318
h2oai_h2ogpt_merge_0087
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': '62aaecd4655f452aedcdbd6fa5a04e1591596b7a', 'parents': ['c81c63afd727f6ad433f0c0aaffcb9d1c6040612', 'dfeabadc032ab96ef8fd9f5835019ec228f94f91'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,319
h2oai_h2ogpt_merge_0088
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': 'c81c63afd727f6ad433f0c0aaffcb9d1c6040612', 'parents': ['aa7b8e81a9b1c321d8f17633d99addafed2f2cce', 'f090db1925f3f87535bc93ec859a1cdcd94f4439'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,320
h2oai_h2ogpt_merge_0089
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': 'beafddc0b9c10f762c57d212b047c9bb5bed8dd9', 'parents': ['2edd8f83b1d6ababa650c12946d173cff01d2fb0', '5dd897cae4961dd36d9353722c529ae34f5fe106'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,321
h2oai_h2ogpt_merge_0090
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': '2edd8f83b1d6ababa650c12946d173cff01d2fb0', 'parents': ['ea08016466bea6313fd8c66306326abf10be938e', '5417bc34452bddca8f8f421a5394c0d748a62499'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,322
h2oai_h2ogpt_merge_0091
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': 'ea08016466bea6313fd8c66306326abf10be938e', 'parents': ['426e06cc68686b877b0bba1b871abfdd8a6b66ec', '3b2288d420309d4cd2e012f8e2400f31ace50ed3'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,323
h2oai_h2ogpt_merge_0092
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': '426e06cc68686b877b0bba1b871abfdd8a6b66ec', 'parents': ['bb38f57ed087d9dd9f045fbe5daf56887fd6fa8a', '1b6738dffe5cec66f9f0d668548929080a878cc5'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,324
h2oai_h2ogpt_merge_0093
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': 'bb38f57ed087d9dd9f045fbe5daf56887fd6fa8a', 'parents': ['9357b7208e24501135b53bd89bc4727e1a13412c', 'e77f54aa6d4f2b1b31a4f1b2cc27b9b0c0033ad6'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,325
h2oai_h2ogpt_merge_0094
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': '9357b7208e24501135b53bd89bc4727e1a13412c', 'parents': ['ebaabd1af90b6707636b97de446128a1577cc8a6', '9e71f30a01ef47e0f9333f5580a55382b4cd15e2'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
1,326
conan_io_conan_merge_0186
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': 'b2ddd27d25d81a419bb5e3f386812ba40a91c5af', 'parents': ['1ecb563ada178b31fb83f5258eaee9cb6900dca0', '4bbaf8c1b781284e85020dd7a469d2d305240696'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,327
conan_io_conan_merge_0187
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': '39b1bb3d32576323927033d86fce6f641a1a8518', 'parents': ['35eb51129ec63cbe69914ddc861c4c818d41570f', '7be9a81976da7d1935c6f1de045b93c0c05a3000'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
merge
medium
month
hard
1,328
conan_io_conan_merge_0188
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': '6d8787c2c9df2ab507d1571e379ec42099019d75', 'parents': ['58a71464a7929ffc68ecf6ff6c9c7fd7568369b6', '663b24cd7a6105119129bb1684f5cf8418c461b6'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
merge
medium
month
hard
1,329
conan_io_conan_merge_0189
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': 'ad54a3ba27f1544bdac8635f465931053abacd7b', 'parents': ['6d7b374c26623c1f5d8c9e03f2fca36c40905579', 'e1606809c9874a26695fdd3d086b933d119fecfd'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
merge
medium
month
hard
1,330
conan_io_conan_merge_0190
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': '69766bfbeda0f3fb82ebd93a71299eb661c267e5', 'parents': ['f77496261f3e362894a31d003d42d05e6623bc6c', '69f69809d24338af56efafcddc034cdddc50d8ae'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,331
conan_io_conan_merge_0191
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': '3026c98275a6dfd45dcd6316fa1f40b384b4d1f5', 'parents': ['dbfd6cf934fc3c5e00d01cb168075df6df265c0f', '267791fee9c15e1ed6f952c63d01b1d770c198ba'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,332
conan_io_conan_merge_0192
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': '2bcca1bc0010ea4f0540b2ac2461ed60169a32b4', 'parents': ['6765a095ae7cc1773fbc93b6cbaad8f9ca5200cb', '2df0f155641a9cfa4abf4492aaffa55de0c42aef'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/model/info.py', 'conans/test/server/conf_test.py']}
merge
medium
month
hard
1,333
conan_io_conan_merge_0193
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': '14fc0dadda0b7161627ea61681d9b8d367d2b3e5', 'parents': ['cb0b6fbdd4db7fe9d86c2c3b90d720fe4f861a0a', '250fe051f9e403a7e19250e07688e6820ed26466'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,334
conan_io_conan_merge_0194
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': 'e2d84baed272bd4343ca54bbe1c2d01b090b72cd', 'parents': ['841c268628561ca2e830dd57e08475657aecb827', '57fbd900bf67933fdc92705a87fad013be36567d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,335
conan_io_conan_merge_0195
conan-io/conan
develop2
MIT License
7,782
2015-12-01T01:17:02
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
python
{'merge_commit_hash': '841c268628561ca2e830dd57e08475657aecb827', 'parents': ['3c9f90b4089ab199b4f025eca5b0117fea79e03b', '41b9ab059cecbe676a7d1410cb37c429057f093d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
merge
medium
month
easy
1,336
stanfordnlp_dspy_merge_0020
stanfordnlp/dspy
main
MIT License
10,934
2023-01-09T09:01:51
not available
python
{'merge_commit_hash': '09e5294ce7fd54d01b9a27a646090082c4a587a5', 'parents': ['bec5f089c21c0217cbdabe122924562596b5a230', 'e893cb7485a1d812f1e663a7f3250f970c6b911f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['dsp/modules/ollama.py']}
merge
medium
month
easy
1,337
stanfordnlp_dspy_merge_0021
stanfordnlp/dspy
main
MIT License
10,934
2023-01-09T09:01:51
not available
python
{'merge_commit_hash': 'f11e867654397dadb8d19c6493ca6c41a2ca2411', 'parents': ['cf5720780d2219485a4f9eb9abe2ff16da73e75b', 'a8492a0053025000abca72ba66a837d8afac96fe'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['dspy/clients/lm.py']}
merge
medium
month
medium
1,338
stanfordnlp_dspy_merge_0022
stanfordnlp/dspy
main
MIT License
10,934
2023-01-09T09:01:51
not available
python
{'merge_commit_hash': '23995244d6e87c59701f836df3c4aaca42a8bc01', 'parents': ['4016da9b97bb3c2032585ecac559be2f4e315a20', '5f0aa61aacb69869a1c152d01fde19b7e57f5b19'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['dspy/__init__.py']}
merge
medium
month
easy
1,339
stanfordnlp_dspy_merge_0023
stanfordnlp/dspy
main
MIT License
10,934
2023-01-09T09:01:51
not available
python
{'merge_commit_hash': '4fd7d76713edc052ddc230f55a25fe70af1ae554', 'parents': ['3231b48a70aece2b6ac07dd226805c7a1e26db53', 'a13072365cd1e18f6784f43722571e2549a92558'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['dspy/evaluate/auto_evaluation.py']}
merge
medium
month
easy
1,340
stanfordnlp_dspy_merge_0024
stanfordnlp/dspy
main
MIT License
10,934
2023-01-09T09:01:51
not available
python
{'merge_commit_hash': '06ff39adaa734b5382597539c39c7599969f209a', 'parents': ['e93e856d438cf99b6055133fd5fad73fc1fa9fd4', '339cb60a9f3077bda614f510f2a1b9b7b7e4f58d'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['dspy/predict/retry.py', 'tests/predict/test_retry.py']}
merge
medium
month
hard
1,341
stanfordnlp_dspy_merge_0025
stanfordnlp/dspy
main
MIT License
10,934
2023-01-09T09:01:51
not available
python
{'merge_commit_hash': '7d484e97419681beb227ff703b57e4607d474ce4', 'parents': ['1b2de8875f7b2ca761267fcb2959d1a7f4e3eaa0', '16ba98a44ff922b26b31e516d446dbbabfaef0b5'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['dspy/adapters/chat_adapter.py']}
merge
medium
month
medium
1,342
stanfordnlp_dspy_merge_0026
stanfordnlp/dspy
main
MIT License
10,934
2023-01-09T09:01:51
not available
python
{'merge_commit_hash': '59f4f9e6731009b05c4a834b699c08026e389ff2', 'parents': ['171c204cbb8717b8ddcb4b3f5906476c1fc07d17', '2bd6fdaced86def090cbe4661fdaa07ee8a3bd03'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['dspy/experimental/synthesizer.py']}
merge
medium
month
easy
1,343
stanfordnlp_dspy_merge_0027
stanfordnlp/dspy
main
MIT License
10,934
2023-01-09T09:01:51
not available
python
{'merge_commit_hash': '248a399ba04e9c3f4562e6eea5e135dc6a594a3d', 'parents': ['171567d818f578429e84bb37de3a5ee27e08c2bd', '87fbf415e678424ba661f175d323c3fd402323a5'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['dspy/retrieve/databricks_rm.py']}
merge
medium
month
easy
1,344
reactor_reactor_netty_merge_0049
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': '8f910234c937be47478427b9cd75c03e750a7388', 'parents': ['f6833bad16632b04004c79d26745c602ecd918f5', 'c9a3142134b91dfd7fea5ac215e78aacbad8c864'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/reactor/netty/http/client/HttpClientOperations.java']}
merge
medium
month
easy
1,345
reactor_reactor_netty_merge_0050
reactor/reactor-netty
main
Apache License 2.0
2,515
2016-08-18T08:58:56
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
java
{'merge_commit_hash': '461706ebd6fa7721b73ec90d1fb8229b1d151927', 'parents': ['9e6e364f4a8ab8d4a3e841bf5619fa9aaa64c3fd', '0d6bff09ad724a52bf26eb2f8fdc4666fa95f678'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/reactor/netty/http/client/HttpClientOperations.java', 'src/main/java/reactor/netty/http/server/HttpServerOperations.java']}
merge
medium
month
hard
1,346
h2oai_h2ogpt_merge_0095
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': 'f1123bc1b96f209a0703c11a13d8c2d3668651b1', 'parents': ['086491e5c2386747c9b1c4954e7ebf1fdc587d4d', '4bbe8ca812b3881b4ffdab61a208d0631cc3516e'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['finetune.py', 'generate.py']}
merge
large
month
hard
1,347
h2oai_h2ogpt_merge_0096
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': 'ad9342b8c8a63b3ec956820c5ccde467b3f7630f', 'parents': ['a899d75296dc2457c4b0bbdb782462c871551dec', 'cc7ac0032dcedffde704d7bb9d2cb14fa02edda6'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/gpt_langchain.py', 'src/gradio_runner.py', 'src/make_db.py']}
merge
large
month
hard
1,348
h2oai_h2ogpt_merge_0097
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': '69d4ed849db719ac3ce0318e96e8e521639642cc', 'parents': ['605db8252b046d652a0c9a6c372cfed413d011e5', 'a652bf3ff43ec3493189b408f67ee4ee35beb2c2'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/enums.py', 'src/prompter.py']}
merge
large
month
hard