Dataset Viewer
Auto-converted to Parquet
id
stringlengths
20
74
name
stringlengths
9
51
default_branch
stringclasses
22 values
license
stringclasses
4 values
stargazers
int64
1.01k
181k
created_at
stringdate
2008-08-28 06:58:04
2024-02-26 11:40:23
topics
stringlengths
3
359
programming_language
stringclasses
3 values
scenario
stringlengths
244
1.1k
sample_type
stringclasses
2 values
project_size
stringclasses
4 values
difficulty
stringclasses
3 values
geysermc_geyser_merge_0005
geysermc/geyser
master
MIT License
4,471
2019-07-08T05:23:17
bedrock;bedrock-edition;bedrock-to-java;bungee;fabric;geyser;geysermc;hacktoberfest;java;java-edition;minecraft;packet;pe;protocol;proxy;spigot;translator;velocity
java
{'merge_commit_hash': '120b367a41019ed2fd445730110c18fa494b606d', 'parents': ['4afef529285e737941cff20c77d91d2a3a21827d', 'e1e09a6ccbb517bddfd4f93b6881743a760fd941'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['core/src/main/java/org/geysermc/geyser/session/GeyserSession.java']}
merge
large
easy
apache_cloudstack_merge_0001
apache/cloudstack
main
Apache License 2.0
1,770
2013-04-29T10:27:12
cloud;cloudstack;iaas;infrastructure;java;kubernetes;kvm;libvirt;orchestration;python;virtual-machine;virtualization;vmware;vsphere;xcp-ng;xenserver
java
{'merge_commit_hash': 'e1b56be67c86d4e5a19bf4c868385cb979396e16', 'parents': ['5d7ea30f87d0c333a647cef832412f30187a29cb', '9293f5bd2764f26418333ef846b126c1f90cfd1b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java']}
merge
huge
easy
alibaba_spring_cloud_alibaba_merge_0001
alibaba/spring-cloud-alibaba
2023.x
Apache License 2.0
27,382
2017-12-01T08:49:15
alibaba;alibaba-middleware;alibaba-oss;aliyun;circuit-breaker;cloud-native;distributed-configuration;distributed-messaging;distributed-transaction;dubbo;java;microservices;nacos;rocketmq;service-discovery;service-registry;spring;spring-cloud;spring-cloud-alibaba;spring-cloud-core
java
{'merge_commit_hash': '717eaa61112db977e2ed028377056d8649167603', 'parents': ['787b299937210cf27a0c84d2dc007836ac00deb2', 'bf08ab31103d1d6c3cc4cd9ec2699218e126bcc0'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/AbstractPropertySourceLoader.java', 'spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoader.java']}
merge
medium
hard
redis_jedis_merge_0011
redis/jedis
master
MIT License
11,663
2010-06-11T01:04:43
java;jedis;redis;redis-client;redis-cluster
java
{'merge_commit_hash': '6a488b6a91a401faae05c4957eefc14f171b1904', 'parents': ['39fc618734b61eb5b024a2454d14656f67517208', 'a02b2eb2dcb1c9ff31afe3fa91ebdd3fad8cad7e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/redis/clients/jedis/JedisClusterInfoCache.java']}
merge
large
easy
apache_iotdb_merge_0068
apache/iotdb
master
Apache License 2.0
4,278
2018-11-24T09:29:17
big-data;database;iot;java;nosql;timeseries;tsdb
java
{'merge_commit_hash': 'ca7b6ea65cdebeb0bc71a96008d224db08d7c7a8', 'parents': ['abe456f5184142569f0a9b398b3e88c2dd8f509a', '6742d4bdf8235cb77dbffb12c67bff7b252a1f0d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java']}
merge
large
easy
jwtk_jjwt_merge_0000
jwtk/jjwt
master
Apache License 2.0
9,906
2014-09-13T01:06:24
jackson;java;java-jwt;jjwt;json;jwe;jwk;jwk-thumbprint;jwk-thumbprint-uri;jwkset;jws;jwt;jwt-auth;jwt-authentication;jwt-bearer-tokens;jwt-claims;jwt-server;jwt-token;jwt-tokens
java
{'merge_commit_hash': '654103016179f73c0da9d7307c4ab7a6f3eca8b3', 'parents': ['ced9b95afd81ca34acace01a0e67b3f73d4b4074', '07f3388d080676dfeb71259efd924ee5afc0f5db'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/io/jsonwebtoken/Header.java']}
merge
medium
easy
apache_rocketmq_spring_merge_0004
apache/rocketmq-spring
master
Apache License 2.0
2,037
2018-10-15T06:07:53
rocketmq
java
{'merge_commit_hash': '87f2218460736af0fe30585645e7467dddb155cc', 'parents': ['4294eb046332f70136412593c1af6e30b49724e5', 'e10cc5e68ff42cb5693655186734677d8df0d7cd'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java', 'rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/core/RocketMQTemplate.java']}
merge
small
hard
codecentric_spring_boot_admin_merge_0002
codecentric/spring-boot-admin
master
Apache License 2.0
12,180
2014-07-25T11:39:13
java;spring;spring-boot;spring-boot-admin;spring-cloud
java
{'merge_commit_hash': '8b952b7fe197714466a40519b05e33c11daffcc0', 'parents': ['1bcebbef8a654182903674c41f3aef02dae033f7', 'a5b9bcaeb61f7b6a6ddd257e4d3d8e010b3e4f39'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/config/SpringBootAdminClientAutoConfiguration.java']}
merge
large
medium
fasterxml_jackson_databind_merge_0009
fasterxml/jackson-databind
2.18
Apache License 2.0
3,466
2011-12-23T07:17:41
hacktoberfest;jackson;jackson-databind;json
java
{'merge_commit_hash': '7401d68fff8dede52a95a01983ffc650b16bda2f', 'parents': ['6debfd2ea0c0e8c9df7819c1949e8297f624a8f1', 'ef4f2920c74eba774c4c9dd1c21be34499db74ce'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/tools/jackson/databind/deser/bean/BeanDeserializer.java', 'src/main/java/tools/jackson/databind/deser/bean/BuilderBasedDeserializer.java']}
merge
large
hard
cucumber_cucumber_jvm_merge_0005
cucumber/cucumber-jvm
main
MIT License
2,674
2011-06-27T07:49:46
cucumber-jvm;java;polyglot-release;tidelift
java
{'merge_commit_hash': 'f0b641e2870ea1f1cdc411e9b17c0c8aaf63dd13', 'parents': ['b66c765d1130009db913cc6736f3957d56f4e016', '0ac2df053713c7604296a30351eb6e09a4725c57'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['core/src/main/java/cucumber/runtime/RuntimeOptions.java']}
merge
medium
medium
knowm_xchange_merge_0000
knowm/xchange
develop
MIT License
3,772
2012-02-02T10:48:28
bitcoin
java
{'merge_commit_hash': '532afe1701c70bebae5c2e7008031bb0fe6ba977', 'parents': ['f8264353e558f67e6ec4341a2a49400a487bed77', '5bd548a349335db57b64e2b8c09965b31e3c0cd8'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['xchange-okex/src/main/java/org/knowm/xchange/okex/dto/OkexInstType.java', 'xchange-okex/src/main/java/org/knowm/xchange/okex/service/OkexMarketDataService.java', 'xchange-okex/src/main/java/org/knowm/xchange/okex/service/OkexMarketDataServiceRaw.java']}
merge
large
hard
apache_curator_merge_0005
apache/curator
master
Apache License 2.0
3,078
2014-03-03T08:00:07
consensus;curator;database;java;zookeeper
java
{'merge_commit_hash': '6b1522c5f2892451be45df89e6537799f146ab51', 'parents': ['ba8ade007acae43c93a961418d47031d803eb61b', '88e8d9a15d4f1690a6df1c1cabb355936f327aaa'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/ServiceCacheImpl.java']}
merge
medium
easy
fasterxml_jackson_databind_merge_0071
fasterxml/jackson-databind
2.18
Apache License 2.0
3,466
2011-12-23T07:17:41
hacktoberfest;jackson;jackson-databind;json
java
{'merge_commit_hash': '630d92bab94670cde1cb6af6d78812e6ccde3cea', 'parents': ['4c9be4d7c5785b7d058eb3b02639e2b278bc5971', 'd311e7b075e61ed01d24b1be458296f1ee98108b'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['src/test/java/tools/jackson/databind/jsontype/TestGenericListSerialization.java', 'src/test/java/tools/jackson/databind/jsontype/TestPolymorphicDeduction.java', 'src/test/java/tools/jackson/databind/jsontype/TestTypeNames.java', 'src/test/java/tools/jackson/databind/jsontype/TestTypedDeserialization.java']}
merge
large
hard
apache_ignite_merge_0057
apache/ignite
master
Apache License 2.0
4,697
2015-02-19T08:00:05
big-data;cache;cloud;data-management-platform;database;distributed-sql-database;hadoop;ignite;in-memory-computing;in-memory-database;iot;network-client;network-server;osgi;sql
java
{'merge_commit_hash': '0cd6723d2e413be61d31827a9f0444d4253a30ed', 'parents': ['a8dae9d0090b53d9a409fb2985fe15ed76319a57', '45bb1ac95a9385f9a03388427cd1df25e9993c42'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java']}
merge
huge
medium
ebean_orm_ebean_merge_0000
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': '3b49a3878d8de81d3a8503856cbb1ea94caaba2e', 'parents': ['0f06480c22e15318bbeb5d85f925e4f8fc0faadd', '77383f4d298f611f94e49ef7d92c34845f8d58f1'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java', 'ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java']}
merge
large
hard
infinispan_infinispan_merge_0001
infinispan/infinispan
main
Apache License 2.0
1,140
2010-11-04T12:33:19
datagrid;infinispan;infinispan-server;inmemory-cache;key-value-store;nosql;persistent-storage;search-engine
java
{'merge_commit_hash': '166ec1432fe5fbb6c43bf7ce831d9f1c708b1930', 'parents': ['3dd8d021835b5f1f568ba03659f1f53fd78d082f', 'f95e93b4cf2ad96a031848b9aa2af072bbd744e6'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['core/src/main/java/org/infinispan/CacheImpl.java', 'core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java', 'core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java', 'core/src/test/java/org/infinispan/test/AbstractCacheTest.java']}
merge
large
hard
648540858_wvp_gb28181_pro_merge_0006
648540858/wvp-gb28181-pro
master
MIT License
4,445
2020-11-14T02:16:37
28181;28181web;gb28181;gb28181server;wvp
java
{'merge_commit_hash': 'bc7e1ecb89f83cd38504d09867a637f12c18cfb0', 'parents': ['9b3721a741ef2c6532ec77dc6cb2c48d763c021d', '81d95188b2a12930b97f335615740b7417b1fcd4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java']}
merge
medium
easy
killbill_killbill_merge_0004
killbill/killbill
master
Apache License 2.0
4,400
2012-10-21T08:55:05
billing;killbill;payments;subscriptions
java
{'merge_commit_hash': '2214c04e35a5957bb9511627673f10929b4041ac', 'parents': ['9c644525e48aae461f73f8bebbfcd3fe55baab3d', 'f508ed98fbf61f7104288921c6f10624897855cf'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['beatrix/src/test/java/org/killbill/billing/beatrix/integration/usage/TestUsageInvoicingIssue.java']}
merge
large
medium
spring_cloud_spring_cloud_netflix_merge_0002
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': 'fbb59f8d0afa8b3d29980b1d9d5f34517abb4af4', 'parents': ['bd46dc42330cc9b328225522cd45d4bcb56e24d8', '066ffa3fead89123691d4ff9cd71e8f5c6f9ba5d'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java', 'spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java']}
merge
medium
hard
batfish_batfish_merge_0009
batfish/batfish
master
Apache License 2.0
1,033
2014-12-03T09:10:18
configuration;configuration-analysis;configuration-parser;network;network-analysis;network-automation;network-security;network-validation;network-verification
java
{'merge_commit_hash': '26a1b537a409a115291b5c47d54ea7c8522bb1b9', 'parents': ['813823776712e8b8d2f383bf5053a807ce5d84ad', 'd8c36ca20c360de826a28fef57af529f633084c7'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['projects/batfish/src/main/java/org/batfish/main/Batfish.java']}
merge
large
medium
alibaba_fastjson2_merge_0001
alibaba/fastjson2
main
Apache License 2.0
3,459
2022-04-17T04:27:24
android;big-data;deserialization;fastjson;fastjson2;graal;graalvm-native-image;high-performance;java;java-json;json;json-deserialization;json-parser;json-path;json-serialization;json-serializer;jsonb;serialization
java
{'merge_commit_hash': '1257e63d0cccb42713cbc3fae523701d3a986aba', 'parents': ['abf055c3ad547c4aceba23024da082fabaced25e', '7a40ea7813cc9ff04deb5c66815d13e9d5f31ce5'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['core/src/test/java/com/alibaba/fastjson2/v1issues/issue_1200/Issue1202.java']}
merge
huge
medium
spring_cloud_spring_cloud_config_merge_0000
spring-cloud/spring-cloud-config
main
Apache License 2.0
1,930
2014-06-13T04:59:44
cloud-native;git;java;microservices;spring;spring-boot;spring-cloud;spring-cloud-core;vault
java
{'merge_commit_hash': '65f848635ad1da2c7742eaaefed318247347c8e8', 'parents': ['a3db3392dcfc8b59f6b1c6891b85ed4f1e973bf5', 'f59f8b5816c407978878340a3a0645113ed73a03'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepository.java', 'spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/AwsS3IntegrationTests.java', 'spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryTests.java']}
merge
medium
hard
apache_phoenix_merge_0016
apache/phoenix
master
Apache License 2.0
1,014
2014-06-04T07:00:08
database;hbase;java;phoenix;sql
java
{'merge_commit_hash': '7a16a0804ffb4295643f65c7a4bb673e17a9613d', 'parents': ['a5d07cc076763000f0c48c4c958e33aa578e85a9', 'f7e6a6c7edc20469189157c4f5935538c5d1140a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java']}
merge
large
medium
micronaut_projects_micronaut_core_merge_0000
micronaut-projects/micronaut-core
4.5.x
Apache License 2.0
5,965
2018-03-07T12:05:08
cloudnative;groovy;java;kotlin;microservices;serverless
java
{'merge_commit_hash': '2a9f53a4fdc299d87c7bc16d248b5b231fb1415d', 'parents': ['114606abbaebfe8cc76062d26de8061cd9a0e519', '0d6af3343a517183c1bb8cb72cf9405303dbb2b1'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['http-server-netty/src/main/java/io/micronaut/http/server/netty/RoutingInBoundHandler.java']}
merge
large
medium
micrometer_metrics_micrometer_merge_0072
micrometer-metrics/micrometer
main
Apache License 2.0
4,348
2017-04-10T09:36:51
cloud-native;java;metrics;microservices;monitoring;observability
java
{'merge_commit_hash': 'a7720f41b851cf956b461334ac05eb48c2552bc5', 'parents': ['c729348b5e67f2ab1b057c68a829ba8be5653a18', 'f9b71a859bc5fe23c7bebd8bcded8cb6b83e5d18'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['implementations/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/v2/DynatraceExporterV2.java']}
merge
medium
easy
henninghall_react_native_date_picker_merge_0000
henninghall/react-native-date-picker
master
MIT License
2,095
2018-04-08T06:31:00
date-time-picker;datepicker;datepicker-component;datetime;react-native;react-native-date-time-picker;react-native-datepicker;react-native-time-picker;time-picker;timepicker
java
{'merge_commit_hash': '01a8dd69fad9f68b173b130ba76558234eec1ae2', 'parents': ['2d9857835e7ca0fc8a52c4228837d03d58b7a1c5', 'f6fadcf04d26df6f8b29b0b1eb2f4cd0fa203e37'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['android/src/main/java/com/henninghall/date_picker/PickerView.java']}
merge
medium
easy
liquibase_liquibase_merge_0027
liquibase/liquibase
master
Apache License 2.0
4,420
2011-07-08T08:08:20
continuous-delivery;continuous-deployment;database;database-administration;database-management;database-migrations;db2;devops;hacktoberfest;java;java-library;liquibase;mariadb;mysql;oracle;sql;sqlserver
java
{'merge_commit_hash': 'ec1a469381fdf31d8141466e60512d5c153a1d2a', 'parents': ['36594eca3baf589d7e9665dc4dddda45f6e2b223', 'e8d1f7db1fa686cc139a1c26d7959dc0f82c5163'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['liquibase-standard/src/main/java/liquibase/command/core/AbstractUpdateCommandStep.java']}
merge
large
easy
langchain4j_langchain4j_merge_0001
langchain4j/langchain4j
main
Apache License 2.0
3,392
2023-06-20T03:30:29
anthropic;chatgpt;chroma;embeddings;gemini;gpt;huggingface;java;langchain;llama;milvus;ollama;onnx;openai;openai-api;pgvector;pinecone;vector-database;weaviate
java
{'merge_commit_hash': 'b94df5d686c90de9fef6aa75fb0ce08631e1b9dc', 'parents': ['cd0cf6c20770b985c4cfc35bbc25dbc95c0d9827', 'abd98a8b0b049ec345ebb715eaa1eec19d519b1a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['langchain4j/src/test/java/dev/langchain4j/service/AiServicesWithToolsIT.java']}
merge
large
medium
spring_projects_spring_authorization_server_merge_0004
spring-projects/spring-authorization-server
main
Apache License 2.0
4,735
2020-03-17T05:28:57
not available
java
{'merge_commit_hash': 'b713d30203961d2987f91f8c25f9c87e293decb1', 'parents': ['04da0129f92a4ffde5785fa84b618e48e38e3b4c', '2b3b5d2531108f2fda7fb2ac07bcd9a742186c6c'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2AuthorizationCodeAuthenticationConverter.java', 'oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ClientCredentialsAuthenticationConverter.java', 'oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2EndpointUtils.java', 'oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2RefreshTokenAuthenticationConverter.java', 'oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/PublicClientAuthenticationConverter.java']}
merge
medium
hard
wiremock_wiremock_merge_0003
wiremock/wiremock
master
Apache License 2.0
6,117
2011-10-09T08:27:24
apis;hacktoberfest;http;java;json;mock-server;mocking;rest;stubbing;wiremock;xml
java
{'merge_commit_hash': 'ae5b9bcb3e51a10cd04fe54b31b67d5222152e11', 'parents': ['b315ccf26db334a754fc1221d9c3b5e82b781e84', '23f965bcb8b67b25ddef439729c4d055dfba7046'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['src/main/java/com/github/tomakehurst/wiremock/mapping/ResponseDefinition.java', 'src/test/java/com/github/tomakehurst/wiremock/StubbingAcceptanceTest.java', 'src/test/java/com/github/tomakehurst/wiremock/client/MappingBuilderTest.java', 'src/test/java/com/github/tomakehurst/wiremock/mapping/ResponseDefinitionTest.java']}
merge
medium
hard
apache_cassandra_merge_0000
apache/cassandra
trunk
Apache License 2.0
8,538
2009-05-21T02:10:09
cassandra;database;java
java
{'merge_commit_hash': 'a42f922eed50d63d853c7bc054aee81f32c0b7d4', 'parents': ['14911e628b70f5203a7f9cae7f9e3f92813c1b65', '666f7df8034fbb10843be7ed61f869cc881c28c5'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['test/unit/org/apache/cassandra/cql3/CQLTester.java']}
merge
huge
easy
cgeo_cgeo_merge_0002
cgeo/cgeo
master
Apache License 2.0
1,365
2011-07-11T06:02:47
android;cgeo;geocaching;opencaching
java
{'merge_commit_hash': '0e06e0524845357523b18f804d444a87d61d7d38', 'parents': ['0d176012e38ee0f11e4bbed3bdfd9404500fd8b3', '8f30ce7529126931462a075b3fc4f9c2b1304638'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['main/src/main/java/cgeo/geocaching/unifiedmap/UnifiedMapActivity.java']}
merge
large
medium
apache_druid_merge_0002
apache/druid
master
Apache License 2.0
13,213
2012-10-23T07:08:07
druid
java
{'merge_commit_hash': '5334e80d46de7e5a7a314e6de6423f280f121611', 'parents': ['23ee4f1f32ec345afe2b8b445cfd767dc0c53580', 'e725ff4146e84a3f3c61b8bea10ed23d7a9e9f9b'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['sql/src/main/java/io/druid/sql/calcite/expression/Expressions.java', 'sql/src/test/java/io/druid/sql/calcite/CalciteQueryTest.java', 'sql/src/test/java/io/druid/sql/calcite/expression/ExpressionsTest.java']}
merge
huge
hard
testcontainers_testcontainers_java_merge_0002
testcontainers/testcontainers-java
main
MIT License
7,811
2015-04-12T12:44:59
docker;docker-compose;hacktoberfest;java;junit;jvm;test-automation;testing
java
{'merge_commit_hash': '10ed55b7ae73938028fc715307e3cdec52f63419', 'parents': ['2fe174664ea6e77061f7869f13bf2889cdb501b9', 'eea61bd9a794842aae7865e505be72a938e2a7e0'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['core/src/main/java/org/testcontainers/containers/GenericContainer.java', 'core/src/test/java/org/testcontainers/containers/GenericContainerTest.java']}
merge
medium
hard
fasterxml_jackson_databind_merge_0117
fasterxml/jackson-databind
2.18
Apache License 2.0
3,466
2011-12-23T07:17:41
hacktoberfest;jackson;jackson-databind;json
java
{'merge_commit_hash': 'd252d600ed027bfed32de526b1f92a4ef96810d9', 'parents': ['b332d1a928772a529dc03ced3e2c6ae35242972f', 'bf8f178e4732f01d76f228c0bc762124cac5a222'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['src/main/java/tools/jackson/databind/deser/jdk/JDKValueInstantiators.java']}
merge
large
medium
cloudfoundry_uaa_merge_0002
cloudfoundry/uaa
develop
Apache License 2.0
1,554
2012-02-07T10:40:55
java;oauth;oauth2;oauth2-server;oidc;oidc-proxy;oidc-server;openid-connect
java
{'merge_commit_hash': '931d5fc5fb5af0f2928542ee1994c5a96b5037d5', 'parents': ['ab81926a15d71ab91fc4f2fb6da9df53429456c6', 'd8583589d81854427654e3bfdfecc33136439a21'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java']}
merge
large
easy
apache_maven_merge_0000
apache/maven
master
Apache License 2.0
4,163
2009-05-21T03:22:03
apache-maven;build-management;hacktoberfest;java;maven
java
{'merge_commit_hash': '56964d50d67708794f6b0ac123314ef52c0a9534', 'parents': ['1f0ed60ba0d9e8c691588cd4c285966d28b614c9', '4af662f7b3e5adcc6b03f3be7aa0f5fb4b8b644a'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java', 'maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java', 'maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java']}
merge
large
hard
apache_camel_merge_0001
apache/camel
main
Apache License 2.0
5,333
2009-05-21T12:25:36
camel;integration;java
java
{'merge_commit_hash': 'd38cb68de38301d645f5c6742c83ba8797a8f2ba', 'parents': ['8cba9e856acde2705ef13354691f4f48cb477756', 'dfedffb9c4270510ee62db37cb022cb4a0808fab'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java']}
merge
huge
easy
react_native_webrtc_react_native_webrtc_merge_0000
react-native-webrtc/react-native-webrtc
master
MIT License
4,502
2015-09-27T10:57:30
react;react-native;webrtc
java
{'merge_commit_hash': 'cb8cb8439f71581e7c3ab6f12685d72d2d0962f2', 'parents': ['3d12b490ea885b185b7c5e3900c8fab088eb71d1', '2502aa349871b9989eaf402379ad6da5b6fba6ec'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['android/src/main/java/com/oney/WebRTCModule/SerializeUtils.java']}
merge
medium
medium
google_data_transfer_project_merge_0000
google/data-transfer-project
master
Apache License 2.0
3,549
2018-01-04T09:27:57
data;data-portability;portability;transfer
java
{'merge_commit_hash': '8e4b2090624a9bf69b3f5566e20ce86dbf16a5b0', 'parents': ['0a5618ccd4ac7969b80a899c331a0294cdd0051e', 'a3607377200c64a48c907b3193688d1f1bb70837'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['extensions/data-transfer/portability-data-transfer-google/src/main/java/org/datatransferproject/datatransfer/google/photos/GooglePhotosImporter.java']}
merge
medium
medium
marquezproject_marquez_merge_0000
marquezproject/marquez
main
Apache License 2.0
1,637
2018-07-05T10:43:20
data-dictionary;data-discovery;data-ecosystem-metadata;data-governance;data-lineage;data-ops;data-provenance;marquez;metadata;metadata-service
java
{'merge_commit_hash': '00b2967d5cb3667651b43b993c36f3b0a29b07b8', 'parents': ['f1efb45b5a1466c04d90d1ee4576bfb774447253', 'e346ff0d4ea183ceebce7a3e9b5116010ece1ebf'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['api/src/test/java/marquez/service/LineageServiceTest.java']}
merge
large
easy
javamelody_javamelody_merge_0000
javamelody/javamelody
master
Apache License 2.0
2,908
2015-06-21T04:32:48
apm;metrics;monitoring;performance
java
{'merge_commit_hash': 'e90bcef05aecb3c16687a129e55e888f28f69bc4', 'parents': ['94fb27539cdce98d8d086169d315d0de262d1a57', 'ec2638ea42ca7ccda1309fc5d0ce3aad91d5d12a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['javamelody-core/src/main/java/net/bull/javamelody/Parameter.java']}
merge
medium
easy
apache_cassandra_merge_0142
apache/cassandra
trunk
Apache License 2.0
8,538
2009-05-21T02:10:09
cassandra;database;java
java
{'merge_commit_hash': '04b00498312c2627bd180485565fbd1b18e1fbc3', 'parents': ['7014cd5ab02f3d0ae28b0783f7df34e05fb79f2a', '880b07c2e63f6e1dea92995a1baa14707e3c2e5e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java']}
merge
huge
medium
netflix_concurrency_limits_merge_0000
netflix/concurrency-limits
master
Apache License 2.0
3,138
2017-12-11T07:32:41
not available
java
{'merge_commit_hash': '62eee256f1841388903796093acb57d05739452c', 'parents': ['0c4dbcc1e2731f5e9603fb4c254e6f7136e76ce2', 'aa09f323a1eba0f2caa8ce88db84b2cec961b6ee'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['concurrency-limits-core/src/main/java/com/netflix/concurrency/limits/limit/GradientLimit.java']}
merge
small
medium
chat2db_chat2db_merge_0003
chat2db/chat2db
main
Apache License 2.0
13,820
2023-06-20T02:05:26
ai;bi;chatgpt;clickhouse;database;datagrip;db2;dbeaver;gpt;hive;mysql;navicat;oracle;postgresql;redis;redis-client;sqlserver;text2sql
java
{'merge_commit_hash': '1e172fc4a529becb6ec5e70dc5e008ac74c13555', 'parents': ['20e810e8bfd8a0cc8a889aa62bd78ae49574f953', 'd9b1df54ef1a394907c6c7233932482bbd374e80'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['chat2db-server/chat2db-plugins/chat2db-hive/src/main/java/ai/chat2db/plugin/hive/builder/HiveSqlBuilder.java']}
merge
medium
easy
spring_projects_spring_graphql_merge_0001
spring-projects/spring-graphql
main
Apache License 2.0
1,493
2020-07-20T04:35:00
graphql;spring-graphql
java
{'merge_commit_hash': 'd794d373c83328be8c5410a578947fc5c840f66f', 'parents': ['2f9840376e023072a2c141850b8da15663741c70', '1a3ae735c1493941405a615092aec86910c3c2e1'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlSetup.java']}
merge
medium
medium
apache_tinkerpop_merge_0004
apache/tinkerpop
master
Apache License 2.0
1,910
2015-02-07T08:00:05
apache;graph;graph-database;graphdb;gremlin;gremlin-server;tinkerpop
java
{'merge_commit_hash': '4631d525a7c0a83ee58063e73453c2c95e9aa6af', 'parents': ['b4f552f915fabf570ea024b408986f16c37d8c37', '70cf34b2c6f92220e96e9c2e113ac21e0a3eb217'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java']}
merge
large
easy
apache_incubator_seata_merge_0000
apache/incubator-seata
2.x
Apache License 2.0
24,967
2018-12-28T08:37:22
at;consistency;distributed-transaction;microservice;saga;tcc;xa
java
{'merge_commit_hash': '9f67de7094052597c678707f5c6382c784a0786f', 'parents': ['1c4b565a539a71105d455e0ccfd69bb2a6ab68d9', '7c9daeb80df9a0708376d48c0be44579144a8c27'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['server/src/main/java/io/seata/server/raft/RaftServerFactory.java']}
merge
large
easy
StarRocks_starrocks_merge_0000
StarRocks/starrocks
main
Apache License 2.0
7,999
2021-09-04T02:29:35
analytics;big-data;cloudnative;database;datalake;delta-lake;distributed-database;hudi;iceberg;join;lakehouse;lakehouse-platform;mpp;olap;real-time-analytics;real-time-updates;realtime-database;sql;star-schema;vectorized
java
{'merge_commit_hash': '23117a41489b5a191ec0ac151ead93a0a2d6c99d', 'parents': ['299049a53512f07b81703404b6b33ae9aa22f601', '503237f8d7ac2f7f412d0aebea14b737551e4a63'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['fe/fe-core/src/main/java/com/starrocks/system/HeartbeatMgr.java', 'fe/fe-core/src/main/java/com/starrocks/system/SystemInfoService.java', 'fe/fe-core/src/test/java/com/starrocks/system/SystemInfoServiceTest.java']}
merge
huge
hard
apache_hadoop_merge_0001
apache/hadoop
trunk
Apache License 2.0
14,396
2014-08-28T07:00:08
hadoop
java
{'merge_commit_hash': '9da62f33beb1373e468055e8df92f493bee97a82', 'parents': ['456bb8a3e01bb41b02cc64a5cff149446668afab', '03aa70fe19e06a0b3d637acc7b5db4c955f0a693'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerReader.java']}
merge
huge
easy
langchain4j_langchain4j_merge_0002
langchain4j/langchain4j
main
Apache License 2.0
3,392
2023-06-20T03:30:29
anthropic;chatgpt;chroma;embeddings;gemini;gpt;huggingface;java;langchain;llama;milvus;ollama;onnx;openai;openai-api;pgvector;pinecone;vector-database;weaviate
java
{'merge_commit_hash': 'c1b6377fe4070eddab7cdc9e1166d57334aebba8', 'parents': ['5c3c45d2843e12de0255026bba2b664942c3281c', '45b5797d7f12d738a1a397168ca92ef2c490d0bc'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 8, 'files_in_merge_conflict': ['langchain4j-azure-open-ai/src/main/java/dev/langchain4j/model/azure/InternalAzureOpenAiHelper.java', 'langchain4j/src/main/java/dev/langchain4j/service/output/JsonSchemas.java', 'langchain4j/src/test/java/dev/langchain4j/service/AiServicesWithToolsIT.java']}
merge
large
hard
spring_projects_spring_data_redis_merge_0000
spring-projects/spring-data-redis
main
Apache License 2.0
1,701
2011-07-01T11:57:33
ddd;framework;java;redis;spring;spring-data
java
{'merge_commit_hash': '9642b7ea720f9b06bb94e8fc1035d2ad3e334699', 'parents': ['c05c0aaaa08e5a7fdff15bdd95228d91cbfa6b65', '27a7ab0738432c858fdec696cded69144ae78268'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java', 'src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java']}
merge
large
hard
opensearch_project_opensearch_merge_0002
opensearch-project/opensearch
main
Apache License 2.0
8,833
2021-01-29T10:10:00
analytics;apache2;foss;hacktoberfest;java;search;search-engine
java
{'merge_commit_hash': 'd02cb04a1649d35a37f0aa1983b13f342bc62e82', 'parents': ['f34aeafdfc255aa56fa208a4b23ea71bc5311928', '30209d850dadd538773ec875f2b54f4101f2472e'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['server/src/main/java/org/opensearch/index/shard/IndexShard.java', 'server/src/main/java/org/opensearch/node/Node.java']}
merge
huge
hard
querz_mcaselector_merge_0000
querz/mcaselector
master
MIT License
2,914
2018-04-22T10:23:26
chunks;delete;export;java-16;javafx;mca-file;mca-region;minecraft;minecraft-saves;minecraft-tool;minecraft-world
java
{'merge_commit_hash': '9ce7807af9c9091a03dbdda999249f252389dfd5', 'parents': ['d57726199d2f2874833f7deff8057b264923ebba', '908665cc94e7c89341571328b063f6d2512725ae'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/net/querz/mcaselector/tiles/TileMap.java']}
merge
medium
easy
google_guava_merge_0000
google/guava
master
Apache License 2.0
49,467
2014-05-29T04:23:17
guava;java
java
{'merge_commit_hash': '1c9f547e6a9c68ec5b9f4af5756939c2f4cfe3eb', 'parents': ['c312960ad03b97a7def829861f558b5ad4dcf513', 'bc7248bcb0a987e18cf7a4e7ef92ed458086f4b0'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['guava/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.java']}
merge
large
medium
spring_projects_spring_authorization_server_merge_0010
spring-projects/spring-authorization-server
main
Apache License 2.0
4,735
2020-03-17T05:28:57
not available
java
{'merge_commit_hash': 'd915f0ab792664e94774b2d2d9f2d8fbf0dbef12', 'parents': ['fb9a13b0ff2d90b5352e699a4cbb8c3bb210f4a8', 'c3e20e98e60e6d6a8603f1abe8ae82ea6255363c'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcTests.java']}
merge
medium
easy
assertj_assertj_merge_0002
assertj/assertj
3.x
Apache License 2.0
2,552
2013-03-14T04:18:49
assertions;assertj;hacktoberfest;java;testing;typed-assertions
java
{'merge_commit_hash': '19ad658f9ac9e4d6a05a8527ec2719c13a7ee203', 'parents': ['9d3b9d05db762dc3b3365d53b0d3c85d9a87b5ac', 'f32974846381c94d9bd7436e3ba98163a96cd97c'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonDifferenceCalculator.java']}
merge
large
easy
Helium314_HeliBoard_merge_0000
Helium314/HeliBoard
main
Apache License 2.0
1,613
2022-03-09T08:38:32
unavailable
java
{'merge_commit_hash': '3ffc6f900db9dc0233641a59f66a77331daf14f9', 'parents': ['9490d94af4887114ccc22c974867c4ef0a7aeadc', 'c3772cd56e770975ea5570db903f93b199de8b32'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java']}
merge
large
easy
itwanger_paicoding_merge_0000
itwanger/paicoding
main
Apache License 2.0
1,711
2022-07-06T12:43:21
java;mybatis;mysql;redis;spring;springboot
java
{'merge_commit_hash': '10581cb8eac11b3fab29e9afa0f1e1b6ccd325b8', 'parents': ['b1d5245ed252b3d52143da950b057ffe8ee364a9', '8e01b6346be74b9ac0b0ed011dbd33ec702614d2'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['paicoding-service/src/main/java/com/github/paicoding/forum/service/user/service/ai/UserAiServiceImpl.java']}
merge
large
easy
apache_rocketmq_spring_merge_0001
apache/rocketmq-spring
master
Apache License 2.0
2,037
2018-10-15T06:07:53
rocketmq
java
{'merge_commit_hash': '965c6b3c5857b4301b1b20cebac93fb7fc63b22f', 'parents': ['c8a34fab6a42ac9393b7882e79a91fa198eef79d', '1bea434f5436b14cae35fb9f9b90737a474ade44'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java']}
merge
small
medium
liquibase_liquibase_merge_0012
liquibase/liquibase
master
Apache License 2.0
4,420
2011-07-08T08:08:20
continuous-delivery;continuous-deployment;database;database-administration;database-management;database-migrations;db2;devops;hacktoberfest;java;java-library;liquibase;mariadb;mysql;oracle;sql;sqlserver
java
{'merge_commit_hash': 'd051cc08a02f401b367077f9f031225d71040a43', 'parents': ['715e6a91b34e0afc1b284c6c8047d05353e04d55', 'a574d1e5cbe8e44e3cd437243ac46660ce520bbc'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['liquibase-cli/src/main/java/liquibase/integration/commandline/LiquibaseCommandLine.java', 'liquibase-core/src/main/java/liquibase/integration/commandline/Main.java']}
merge
large
hard
mockito_mockito_merge_0001
mockito/mockito
main
MIT License
14,617
2012-10-13T08:27:12
java;java-library;mock;mock-library;mocking;mocking-framework;mockito;mocks;test-automation;test-driven-development;testing;testing-tools
java
{'merge_commit_hash': '8c294844745bc17bae2574eb22581bc5ed991334', 'parents': ['28669a0ec9094b70eac637f6c672d05a9aa7dff0', '6f14c84c026fddc084e40b374ae63ab6ff36ca78'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/test/java/org/mockitousage/verification/DelayedExecution.java']}
merge
medium
easy
apache_rocketmq_merge_0005
apache/rocketmq
develop
Apache License 2.0
20,634
2016-11-30T08:00:08
cloud-native;eventing;hacktoberfest;java;messaging;rocketmq;streaming
java
{'merge_commit_hash': 'd21266d98822ade56c2b2420fc8d96df28a0eafe', 'parents': ['3aa4943776b86b459bf0fee4aec50f31c6b05e62', 'd067bfc21410c11dc3c99bb2b67403aa4b344286'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettySystemConfig.java']}
merge
large
easy
apache_hadoop_merge_0002
apache/hadoop
trunk
Apache License 2.0
14,396
2014-08-28T07:00:08
hadoop
java
{'merge_commit_hash': 'ae9014ef6a6a135c1244e2bc5c09b29fd11da370', 'parents': ['481f84597bf842df45b068cc24c328112e8bcf40', 'b57260f848da5cfc6b03c871987ed34d8bfda9c7'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java', 'hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java', 'hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java']}
merge
huge
hard
pengrad_java_telegram_bot_api_merge_0001
pengrad/java-telegram-bot-api
master
Apache License 2.0
1,679
2015-08-04T11:58:56
bot;telegram;telegram-api;telegram-bot;telegram-bot-api
java
{'merge_commit_hash': '59b799af40d4c60d40618ca7e3af19820ac9c0c9', 'parents': ['0e0f3ffb95f364109e35f840c3db3932b99de474', 'f45090b593f95363cde5205cc79c1ff8f74f942c'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java']}
merge
medium
medium
apache_pinot_merge_0001
apache/pinot
master
Apache License 2.0
5,166
2014-05-19T11:27:48
java
java
{'merge_commit_hash': '867856114b24e2c290dfc5b4a020452c24e63a8a', 'parents': ['10f528a7aa297803fb566b0aa2baa6d0309dd1fc', '68b966b18e00af96cbd082c9fafdbb55239412dd'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['thirdeye/thirdeye-pinot/src/main/java/com/linkedin/thirdeye/anomaly/detection/DetectionJobRunner.java', 'thirdeye/thirdeye-pinot/src/main/java/com/linkedin/thirdeye/client/pinot/PinotThirdEyeClient.java']}
merge
large
hard
killbill_killbill_merge_0002
killbill/killbill
master
Apache License 2.0
4,400
2012-10-21T08:55:05
billing;killbill;payments;subscriptions
java
{'merge_commit_hash': 'f73e9a0c0538dea759de6faee0332cc53a506077', 'parents': ['2457bff3053942cc0e0438b34d1719a59ee19907', 'c64f1ed838bd2333729ef1787e1560dbbab48d62'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java']}
merge
large
easy
cucumber_cucumber_jvm_merge_0001
cucumber/cucumber-jvm
main
MIT License
2,674
2011-06-27T07:49:46
cucumber-jvm;java;polyglot-release;tidelift
java
{'merge_commit_hash': '15c7221596ed292212da22cf776972a4d36e5ced', 'parents': ['b78dac765a3fcaa813b791d0c7e5a1193d008fab', '38b4ccc389030b75ea94f188b98f4efa39f9b8af'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/FeatureResolver.java']}
merge
medium
easy
mekanism_mekanism_merge_0002
mekanism/mekanism
1.20.6
MIT License
1,324
2012-08-15T08:41:13
not available
java
{'merge_commit_hash': 'b7c8942535d902304124a81ee57f436091c2f051', 'parents': ['7ff46ace523a636b8c1c8bf6cbbe61e4339e2159', 'c207c0340697d9baf44968bafa794fd4f46dabfa'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java', 'src/main/java/mekanism/common/multiblock/SynchronizedData.java']}
merge
large
hard
apache_shenyu_merge_0000
apache/shenyu
master
Apache License 2.0
8,307
2018-07-11T08:17:45
api-gateway;dubbo-proxy;grpc-proxy;http-proxy;motan-proxy;reactor-java;sofa-proxy;spring-cloud-proxy
java
{'merge_commit_hash': '02fc2c8a39dd6edb4dce5c8caee54cf09aa32995', 'parents': ['723d79de6fb846c7ae2bfb1330ceb4bbd420c992', '48bccb644992219173dd500cfc667b3916998735'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['soul-web/src/main/java/org/dromara/soul/web/plugin/function/DividePlugin.java']}
merge
large
easy
assertj_assertj_merge_0000
assertj/assertj
3.x
Apache License 2.0
2,552
2013-03-14T04:18:49
assertions;assertj;hacktoberfest;java;testing;typed-assertions
java
{'merge_commit_hash': '0543f2506b5a6557c338442fd00fd97439b40623', 'parents': ['f0d630c585ba5434f643ea88ff98f4e1b225c5e0', 'b1c7f264042ac6ba15f745f94ef8ada7e50797f3'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/main/java/org/assertj/core/internal/PropertySupport.java', 'src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_Test.java']}
merge
large
hard
hcoles_pitest_merge_0003
hcoles/pitest
master
Apache License 2.0
1,640
2014-01-07T09:34:34
coverage;java;junit;mutation-analysis;mutation-testing;testing;testng
java
{'merge_commit_hash': 'cc2f5649b4b7524be48e22c2d9464d5997a45952', 'parents': ['a3fa6bd3fb623b1b7c4c1fcb5f363041ce90643e', 'ecac98b4bade6e1bc97e6d423dc396812bed2d7f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['pitest/src/test/java/org/pitest/util/ManifestUtilsTest.java']}
merge
medium
easy
reactor_reactor_netty_merge_0073
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': '4bf4cba76d1413b55132148f33e0737ea49e8a5f', 'parents': ['14a9172754db933a3e9a831d0eb134133eacc323', '0d8bad4191d254b99d9d12316aa27a83775e249b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/reactor/netty/ReactorNetty.java']}
merge
medium
easy
pinterest_teletraan_merge_0003
pinterest/teletraan
master
Apache License 2.0
1,792
2015-12-09T10:08:45
not available
java
{'merge_commit_hash': '00c6c89c678c0205377a78e1f1dab4bf24b0418c', 'parents': ['bc469d09a0dda4e7782af96d510e6aea21e91c03', '12c73ee7ce9b41105c6db2b9a7ec84f7077b65c4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/AgentJanitor.java']}
merge
medium
medium
spring_projects_spring_security_merge_0036
spring-projects/spring-security
main
Apache License 2.0
8,451
2012-01-10T09:50:57
framework;java;security;spring;spring-framework
java
{'merge_commit_hash': 'a911f3d52f13e68702bcdedb42767eefe580f51b', 'parents': ['3854afad613a548abb5e5aafd28b8844d0b34e3f', '9926ad68b8f4e465f6c5243a8ff993fbf9d1b7a2'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java', 'config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java']}
merge
large
hard
reactor_reactor_core_merge_0001
reactor/reactor-core
main
Apache License 2.0
4,834
2015-11-10T10:06:40
asynchronous;flow;flux;jvm;mono;reactive;reactive-extensions;reactive-streams
java
{'merge_commit_hash': '48ed8848458e291101c55b36e4108e8586baba9d', 'parents': ['0abfe1148d87324b26057e72764932f5f00ee3c9', 'a013231fe0ad5d1f41fc796e04f4ff82cd9dd8ae'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['reactor-core/src/main/java/reactor/core/publisher/UnicastProcessor.java']}
merge
large
medium
apache_rocketmq_spring_merge_0003
apache/rocketmq-spring
master
Apache License 2.0
2,037
2018-10-15T06:07:53
rocketmq
java
{'merge_commit_hash': 'd0f973f41b779f5d045f97e4629b82aa88b4fa39', 'parents': ['9db9c3857d4a4c16e8119447e55133e602be3d51', '07598bf219b42e3331c1b9bfa2b5dff2cf51f01f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQAutoConfiguration.java']}
merge
small
easy
apache_solr_merge_0002
apache/solr
main
Apache License 2.0
1,028
2021-02-23T12:12:42
backend;information-retrieval;java;lucene;nosql;search;search-engine;solr
java
{'merge_commit_hash': '43be691c4f3d8df176df4f5f3d5ad2a032cc5950', 'parents': ['4a46b6d85c66ca2b34a5c8a365ac3087221c0a11', '7c2edd75a81a3df807e4de32e248e521283969d2'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java']}
merge
huge
easy
testcontainers_testcontainers_java_merge_0000
testcontainers/testcontainers-java
main
MIT License
7,811
2015-04-12T12:44:59
docker;docker-compose;hacktoberfest;java;junit;jvm;test-automation;testing
java
{'merge_commit_hash': 'c808480747cde40df4da9f69f23feafbd691a4d9', 'parents': ['e489e12f87670919438fbae58838bc7be3f73c26', '3b0a7e652b5913cae2e560c748ba75e2535e9ca3'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java']}
merge
medium
medium
alluxio_alluxio_merge_0002
alluxio/alluxio
main
Apache License 2.0
6,672
2012-12-21T05:43:46
alluxio;data-analysis;data-orchestration;hadoop;memory-speed;presto;spark;tensorflow;virtual-distributed-filesystem
java
{'merge_commit_hash': 'd5b4517fd58791a9f484e81d02cda383d1879db6', 'parents': ['df7d58d165ef1cda9c1f8742da60a625c8bf50b4', '6945af272e8cd10e8ad94b785f4a01da070886c8'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['core/client/fs/src/main/java/alluxio/client/file/cache/LocalCacheFileSystem.java']}
merge
large
easy
apache_nutch_merge_0000
apache/nutch
master
Apache License 2.0
2,824
2009-05-21T01:17:48
apache;crawling;hadoop;java;nutch;web-crawler
java
{'merge_commit_hash': '49d85eac73989b782bcc92aa1b03cac0b8770916', 'parents': ['d764e4c1668794ba80ec1ad4d00d2a69bc80aa9c', 'adadc43fb169793c47ab25a0eba99a5f20eda763'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/plugin/urlfilter-fast/src/java/org/apache/nutch/urlfilter/fast/FastURLFilter.java']}
merge
medium
easy
spring_cloud_spring_cloud_config_merge_0018
spring-cloud/spring-cloud-config
main
Apache License 2.0
1,930
2014-06-13T04:59:44
cloud-native;git;java;microservices;spring;spring-boot;spring-cloud;spring-cloud-core;vault
java
{'merge_commit_hash': '80e6074a4fa5fed4ea0772a756a2f9ce856838fb', 'parents': ['a05779bee63c1f4062d12a2150b8bc5c02cd1f16', '588870ca5f09b89b7ca7ca83801caf02c7e03f62'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java']}
merge
medium
easy
alibaba_arthas_merge_0000
alibaba/arthas
master
Apache License 2.0
34,793
2018-08-29T05:15:57
agent;alibaba;arthas;classloader;diagnosis;java;jvm;trace;trouble-shooting
java
{'merge_commit_hash': 'd750d89868f7dd71689555974223b750b495d353', 'parents': ['ccb03a2986b74449a79e4b20f08239b12ab5d25a', '5bb70c6b962753600c7ec43cd354a634a8bc1acc'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['agent/src/main/java/com/taobao/arthas/agent/AgentBootstrap.java']}
merge
large
medium
clickhouse_clickhouse_java_merge_0003
clickhouse/clickhouse-java
main
Apache License 2.0
1,376
2016-07-15T12:48:27
clickhouse;java-client;jdbc;jdbc-driver
java
{'merge_commit_hash': '57f89010c729a4f53262a3ac54cd6d4badc234c7', 'parents': ['0e4f109bada8b74c958666fa5d656997d3cb6fa7', '762d78a5bc27e9064978f3f8db13f8218a089021'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java']}
merge
large
medium
cloudfoundry_uaa_merge_0001
cloudfoundry/uaa
develop
Apache License 2.0
1,554
2012-02-07T10:40:55
java;oauth;oauth2;oauth2-server;oidc;oidc-proxy;oidc-server;openid-connect
java
{'merge_commit_hash': '02bd32b3c873b683e91822e361b5b3a3f2be21e2', 'parents': ['a9517974cff7f5407851a385b52f8343e150a28d', '500228c40e4b64770751931728c08cbab65ddfdc'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['server/src/test/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioningTests.java']}
merge
large
medium
spring_cloud_spring_cloud_config_merge_0007
spring-cloud/spring-cloud-config
main
Apache License 2.0
1,930
2014-06-13T04:59:44
cloud-native;git;java;microservices;spring;spring-boot;spring-cloud;spring-cloud-core;vault
java
{'merge_commit_hash': '686064e22efc7d39e4e76f1bfdb113ad3c506277', 'parents': ['3e3638a81334ce601231984bba13d37c915c57c4', 'd6f3177bfb6a63a683f16cb96f663625dd7be176'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java']}
merge
medium
medium
spongepowered_mixin_merge_0000
spongepowered/mixin
master
MIT License
1,319
2014-12-04T03:57:51
annotations;asm;gradle;java;minecraft;mixin-framework;mixins;processor;trait
java
{'merge_commit_hash': 'a3b98d8a157b0728cb231d4a03f6a70036eb9b32', 'parents': ['7b8c41a1003f55da0c090019a8c05ff12abdaa2d', 'f0d25bd2995cda0064929f625e750ec8e27f6783'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java', 'src/main/java/org/spongepowered/asm/mixin/injection/code/Injector.java']}
merge
medium
hard
jmonkeyengine_jmonkeyengine_merge_0002
jmonkeyengine/jmonkeyengine
master
BSD 3-Clause New or Revised License
3,714
2014-03-20T10:29:28
game-engine-3d;hacktoberfest;java;jme3;jmonkeyengine;jmonkeyengine3
java
{'merge_commit_hash': 'fca6d4a8b243014e5388c22ca2ae4fdaab7f8ef7', 'parents': ['8d125a30ba751f494c4da912186c058be7956a8a', 'ad2a9e623031712fd890a6544bfebbec50abd0e3'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['jme3-core/src/plugins/java/com/jme3/shader/plugins/GLSLLoader.java']}
merge
large
easy
openapitools_openapi_generator_merge_0000
openapitools/openapi-generator
master
Apache License 2.0
20,066
2018-05-12T09:57:56
api;api-client;api-server;generator;hacktoberfest;openapi;openapi-generator;openapi3;rest;rest-api;rest-client;restful-api;sdk
java
{'merge_commit_hash': '56f9737b2d1c290a5b7fcd5131070effd4326667', 'parents': ['e315d486365ccbfc25e98a5b1876d2c7ee65a320', '19e14237aa3de53facbb65800fcfb3c7f8bb53f6'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java', 'modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java']}
merge
huge
hard
chat2db_chat2db_merge_0000
chat2db/chat2db
main
Apache License 2.0
13,820
2023-06-20T02:05:26
ai;bi;chatgpt;clickhouse;database;datagrip;db2;dbeaver;gpt;hive;mysql;navicat;oracle;postgresql;redis;redis-client;sqlserver;text2sql
java
{'merge_commit_hash': 'f28d169f109be7ef2525f476c60888602a8a82a4', 'parents': ['60f89ddc8efe73dec479f9b9a26c758bc291ed68', 'a4f96cb921f6ec386b671b5f01ef47e5c41df2a1'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/builder/ClickHouseSqlBuilder.java', 'chat2db-server/chat2db-plugins/chat2db-h2/src/main/java/ai/chat2db/plugin/h2/H2Meta.java', 'chat2db-server/chat2db-plugins/chat2db-hive/src/main/java/ai/chat2db/plugin/hive/builder/HiveSqlBuilder.java', 'chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/SQLExecutor.java']}
merge
medium
hard
nutzam_nutz_merge_0001
nutzam/nutz
master
Apache License 2.0
2,515
2011-06-10T01:25:43
aop;ioc;java;javaee;micro-framework;nutz;orm
java
{'merge_commit_hash': 'eede99a7e3069b1fe6bb8a3062d4df7b614fe0e4', 'parents': ['6b80c3294d59d6b2ad0935c8a7efea4c58575b44', 'b447a8a10568c3ad3c10f5da57041c8ca84399b6'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/org/nutz/lang/Encoding.java']}
merge
large
medium
apache_iotdb_merge_0023
apache/iotdb
master
Apache License 2.0
4,278
2018-11-24T09:29:17
big-data;database;iot;java;nosql;timeseries;tsdb
java
{'merge_commit_hash': '5d654bdbbd3b6a2b5fc7a614b870ae8443c3c0ae', 'parents': ['069dc241bc1863c88ba25f553a88ace4c855c468', 'a7a1738c1ee2aa82014e37cf161cb9b5ed5a1448'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java']}
merge
large
medium
orientechnologies_orientdb_merge_0000
orientechnologies/orientdb
develop
Apache License 2.0
4,697
2012-12-09T08:33:47
database;dbms;document-database;fast;graph-database;graph-store;multi-master;multi-model-dbms;nosql;orientdb;performance;sql
java
{'merge_commit_hash': '96f71535b63f7e8a47a2db76386639fcf4c90eb0', 'parents': ['88a08d7bc15500b7a28dcdf847c93b70f4992400', '9a3a0a6eb9db933acdec89be302c64e799dbeda5'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['core/src/main/java/com/orientechnologies/orient/core/storage/cluster/OClusterPage.java', 'core/src/test/java/com/orientechnologies/orient/core/storage/cluster/ClusterPageTest.java']}
merge
large
hard
resteasy_resteasy_merge_0000
resteasy/resteasy
main
Apache License 2.0
1,084
2011-12-09T03:15:43
not available
java
{'merge_commit_hash': 'f7520f09e425e2c428b1a4c51518db28f053d422', 'parents': ['fd66aad3cb1e8553323a9af5b58f1ad5150dc5b9', 'ae48246c6d67b9b698d92beab9c844c1daa9a488'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/RegisterBuiltin.java']}
merge
large
easy
discord_jda_jda_merge_0000
discord-jda/jda
master
Apache License 2.0
4,153
2015-12-12T01:57:32
api;api-wrapper;bot;bot-api;discord;hacktoberfest;java;javadoc;jda;promoted-downloads;rest;rest-api;websocket
java
{'merge_commit_hash': '3e0d2f868e58af733eb50591ed19f601fdb20541', 'parents': ['d77682b58f4c4fff1cad44f1bf082ba73424d384', 'a35789442ba022c81ce9b5f62d5b6b9968e3895d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/net/dv8tion/jda/api/interactions/commands/build/OptionData.java']}
merge
medium
easy
kairosdb_kairosdb_merge_0002
kairosdb/kairosdb
develop
Apache License 2.0
1,728
2013-02-05T10:27:48
java;kairosdb;metrics;timeseries;timeseries-database
java
{'merge_commit_hash': 'ec20fbb8ccd281a0ed9a7ccda125944d88370917', 'parents': ['cebe34dca0a7ee5208b4d2107d41958c83489a32', '210550d06dd1a2c5745506ba13ee8aa242cc9934'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/org/kairosdb/core/aggregator/RangeAggregator.java']}
merge
large
easy
embulk_embulk_merge_0002
embulk/embulk
master
Apache License 2.0
1,727
2014-09-16T03:58:52
bulk-loader;embulk
java
{'merge_commit_hash': '61b702ddf16b495f442dc7a65128d614b30e3fd7', 'parents': ['863d0598ac87399676157a6478c4b4f0e60ae440', '7ad3cd9f688a34e3e18cf755f40f265cf982594d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['embulk-standards/src/main/java/org/embulk/standards/CsvParserPlugin.java']}
merge
medium
easy
alluxio_alluxio_merge_0008
alluxio/alluxio
main
Apache License 2.0
6,672
2012-12-21T05:43:46
alluxio;data-analysis;data-orchestration;hadoop;memory-speed;presto;spark;tensorflow;virtual-distributed-filesystem
java
{'merge_commit_hash': '28fe5041a28fbd100b3c3ace3f7f70ae850717b6', 'parents': ['41b94ad6892a86d85c2bcdb6ad327ea12e52cbd9', '2df21b9aee0e07189c69649a4ed52b3c66b66483'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['core/server/worker/src/main/java/alluxio/worker/page/PagedBlockStore.java', 'core/server/worker/src/main/java/alluxio/worker/page/PagedBlockStoreMeta.java']}
merge
large
hard
synthetichealth_synthea_merge_0001
synthetichealth/synthea
master
Apache License 2.0
2,021
2016-06-17T08:15:40
fhir;health-data;simulation;synthea;synthetic-data;synthetic-population
java
{'merge_commit_hash': 'e4c096b8df3c155293b5a22f5052ca5d336a45cd', 'parents': ['740a1344b33cf991797949d3f3971bcbcde91e3a', '271aa6eaaf66bb7ca40cd4ffd44795e70f1947a6'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/org/mitre/synthea/engine/State.java']}
merge
huge
easy
apache_cassandra_merge_0149
apache/cassandra
trunk
Apache License 2.0
8,538
2009-05-21T02:10:09
cassandra;database;java
java
{'merge_commit_hash': '1ac31a64a9d02372f59938592aff283ed7c0b438', 'parents': ['15f355a0062148e1ca511e8fc515e0cba380790d', 'b8209a06fbad6d5dda239f06ea889a4a89427296'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/java/org/apache/cassandra/gms/Gossiper.java']}
merge
huge
easy
End of preview. Expand in Data Studio

Dataset Summary

GitGoodBench Lite is a subset of 900 samples for evaluating the performance of AI agents in resolving git tasks (see Supported Scenarios). The samples in the dataset are evenly split across the programming languages Python, Java and Kotlin and the sample types merge conflict resolution and file-commit gram. This dataset thus contains 150 samples per sample type and programming language.

All data in this dataset are collected from 479 unique, open-source GitHub repositories with permissive licenses that have >= 1000 stars, >= 5 branches, >= 10 contributors and are not a fork or archived. We collected the initial list of repositories using SEART.

Evaluation is to be performed by exact-match (EM) of diffs for the merge conflict setting and by LLM-as-a-Judge for the file-commit chain setting. For further details see our paper.

Supported Tasks

GitGoodBench Lite contains two types of samples: 'merge' and 'file_commit_chain'. It is important to note that the sample type 'file_commit_chain' can be used for two scenario types: Performing an interactive rebase to clean up the local tree or iteratively generating commits based on the staged, uncommitted changes.

Merge

Merge scenarios are contain one or more merge conflicts that occurred during a merge. All merge conflicts are guaranteed to be in a Python, Java or Kotlin file. There are only merges with exactly two parents in our dataset (no octopus merges).

A merge scenario looks as follows:

{
  'merge_commit_hash': '1ce7091bffb09ad7e5123ea995c1f572a83bd375',
  'parents': ['5ef9152860a8b0af02e9d5d3635601df963748c9', '8a353cf3392e0c20dc987bc18f4ab93edccf09b3'],
  'number_of_files_with_merge_conflict': 1,
  'total_number_of_merge_conflicts': 3,
  'files_in_merge_conflict': ['src/test/java/net/openhft/chronicle/queue/LastAppendedTest.java']
}

Where merge_commit_hash contains the ground truth merge commit and the parents are the commits during the merge of which the conflict(s) in files_in_merge_conflict occurred.

File-Commit Chain

File-commit chain scenarios consist of two commits, the oldest and newest commit. In all commits between the oldest_commit and newest_commit (inclusive) file was modified. In total the chain consists of times_seen_consecutively commits. The intended use-cases of these scenarios are to evaluate the agent's capacity to create meaningful, cohesive commits or improve the local tree via rebasing. Thus samples of this sample_type cover two scenario types.

File-commit chains are at least 3 commits long,the file the sample concerns itself with is guaranteed to be of programming_language (this is not the case for other potential files in the commits of the sample) and no commit is a merge commit.

A file_commit_chain scenario looks as follows:

{
  'file': 'App/Event.py',
  'branch': 'origin/20230105',
  'times_seen_consecutively': 4,
  'purity': 0.78,
  'newest_commit': '7547d1877f0af28a67fe0e1ccaefcb0020a89751',
  'oldest_commit': 'a0a11bd4de009daae463c77fccdb2de16cfed6c4'
}

purity indicates the relative amount of changes in the chain that occurred solely in file and is a heuristic for the difficulty of the scenario. We expect noisier scenarios to be more difficult.

Dataset Structure

The following table provides per-field details. Columns marked “Yes” under Is Metadata? are those that provide contextual or descriptive information but are not essential to the primary scenario logic.

Field Type Description Is Metadata?
id string A unique identifier for the dataset entry: -- No
name string The repository name, in “owner/repository” format. No
default_branch string The primary or default branch for the repository. No
license string Repository license. Yes
stargazers integer The number of stars on GitHub. Yes
created_at string The repository creation date. Yes
topics string A semicolon-delimited list of topics or tags associated with the repository. Yes
programming_language string The programming language of the sample. Possible values: "java," "python," or "kotlin." No
scenario string A JSON string describing specific scenario data (e.g., merge-conflict details, parent commits). No
sample_type string The type of sample. Possible values: "merge" or "file_commit_chain." No
project_size string Estimated size based on lines of code. Possible values: "tiny," "small," "medium," "large," or "huge." Yes
difficulty string The complexity level of the scenario. Possible values: "easy," "medium," or "hard." Yes

Note:

  • Fields marked as Is Metadata? = Yes provide contextual information (e.g., project stats, licensing) rather than forming the core logic of a scenario.
  • Fields marked No represent the primary data for the scenario. Use them to inform or categorize the scenario type and project details.

Dataset statistics

We provide some statistics on the diversity of our dataset with respect to repositories and merge conflict resolution samples.

Dataset Skew

We note that our dataset is skewed towards the top four repositories especially, however skew flattens quickly.

Distribution Statistics

  • Total number of repositories (count): 479
  • Average (mean) samples per repository: 1.87
  • Standard deviation (std): 2.8
  • Minimum (min): 1
  • 25th percentile (25%): 1
  • Median (50%): 1
  • 75th percentile (75%): 2
  • Maximum (max): 46

Top-10 Repositories by Sample Count

Repository Percentage of Total Samples
oss-review-toolkit/ort 5.11%
stripe/stripe-android 3.22%
element-hq/element-android 2.44%
jetbrains/compose-multiplatform 1.22%
kotlin/dokka 1.00%
jetbrains/ideavim 0.89%
wikimedia/apps-android-wikipedia 0.78%
android/nowinandroid 0.78%
coil-kt/coil 0.78%
jetbrains/exposed 0.78%

Difficulty Distribution for "merge" Scenarios

Difficulty Percentage
easy 41.33
medium 24.44
hard 34.22

Languages We note that the text data in this dataset consists mostly of: commit messages, comments and is primarily in English. We do however not filter for any human languages explcitly.

Downloads last month
30