Dataset Viewer
Auto-converted to Parquet
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
difficulty
stringclasses
3 values
jmonkeyengine_jmonkeyengine_merge_0000
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': '7326c45ee878fc87e25c7ed4ebef1f819c5407d6', 'parents': ['054e4dc00fc985390487f433fa6308d3c967b6cf', '4b4cf62008f33fe933ec3851c6b20d3b2c694b86'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java']}
merge
large
easy
gnembon_fabric_carpet_merge_0000
gnembon/fabric-carpet
master
MIT License
1,610
2019-05-10T02:54:10
unavailable
java
{'merge_commit_hash': '842370f68d13e0759af4b1779e6bc5baa1537901', 'parents': ['2b7201612f01162e18b623da7068658710cd0076', 'c33c53c8c22a9c9b6535317a7d4a753e7c14169a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/main/java/carpet/script/api/Auxiliary.java']}
merge
medium
medium
spring_projects_spring_authorization_server_merge_0000
spring-projects/spring-authorization-server
main
Apache License 2.0
4,735
2020-03-17T05:28:57
unavailable
java
{'merge_commit_hash': 'cd0ab788ca26abfad51c020ef83bb7b2c3855e57', 'parents': ['5c65ef15a7805d0332507770de157f602fa504cd', '668ad6ce591cd4d26fab8915bf55273a2fe6a8c1'], '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/web/OAuth2AuthorizationServerMetadataEndpointFilterTests.java']}
merge
medium
easy
langchain4j_langchain4j_merge_0000
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': '8d9c5902e2e254d60dc4420e24c36639c404e44f', 'parents': ['a00f4b5485db6d1116a4e66384bc7fcd5920c032', '350d84394a6c56e27b7f8a906aaa4d10ac222c74'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['langchain4j-google-ai-gemini/src/test/java/dev/langchain4j/model/googleai/GoogleAiGeminiAiServicesWithToolsIT.java']}
merge
large
easy
liquibase_liquibase_merge_0000
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': '23d58021ce8f21e1cb86c47f7d9252bb70192d0d', 'parents': ['ef76c5783b22b26ed2d139893dfd2129228f91f6', 'a0310ae11f44cab25476d6ea29545a880df67922'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['liquibase-core/src/main/java/liquibase/resource/PathHandlerFactory.java']}
merge
large
medium
jmonkeyengine_jmonkeyengine_merge_0001
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': '6fb2d029d2331d0fb177663e38a7dc3195611226', 'parents': ['5108f52ebf06012abcfc5c50eeffadb805a35ced', '531ff4edb14d24cba28c2cfc67119411b94e4ea3'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['jme3-core/src/main/java/com/jme3/shadow/ShadowUtil.java', 'jme3-core/src/plugins/java/com/jme3/shader/plugins/GLSLLoader.java']}
merge
large
hard
firebase_firebase_android_sdk_merge_0000
firebase/firebase-android-sdk
master
Apache License 2.0
2,212
2018-08-31T08:50:43
android;database-as-a-service;firebase;firebase-abt;firebase-android-sdk;firebase-database;firebase-firestore;firebase-functions;firebase-inappmessaging;firebase-library;firebase-realtime-database;firebase-remote-config;firebase-storage
java
{'merge_commit_hash': 'bd35a959c19367ede344b0145bee66d01bc090d9', 'parents': ['a71fe82c0b229d6fcb22c602f31ddca569de981a', '5661f383c514b998cc6018a6a88767a6a6d4bcc0'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['firebase-installations/src/main/java/com/google/firebase/installations/remote/FirebaseInstallationServiceClient.java']}
merge
large
medium
magefree_mage_merge_0000
magefree/mage
master
MIT License
1,772
2012-04-27T01:18:34
ai;card;ccg;client-server;computer-opponents;deck;game;game-engine;java;linux;macos;magic;magic-the-gathering;mtg;mtgjson;multiplayer;scryfall;windows;xmage
java
{'merge_commit_hash': '620d524b68ae4c232a0c3c5ed7543d2edb09eab4', 'parents': ['0324c1ad9f222f63073af653bca62591bd2bf488', '8ff6234cb195685cf29e1a67b1679ffc7c1153a8'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Brawl.java']}
merge
huge
easy
hs_web_hsweb_framework_merge_0000
hs-web/hsweb-framework
master
Apache License 2.0
8,268
2016-01-18T03:51:39
hsweb;java;java8;javaweb;mybatis;r2dbc;reactive-streams;reactor;spring-boot;spring-webflux
java
{'merge_commit_hash': 'fafb29033e428c45a5e7ddfec396be4043066bcb', 'parents': ['126c54cfb47869fc28748b35d62d9c8b149a6c31', '8aa65eb23195af8b90b6600adf6c6c0e7d39df15'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['hsweb-starter/src/main/java/org/hswebframework/web/starter/jackson/CustomCodecsAutoConfiguration.java']}
merge
medium
medium
apache_druid_merge_0000
apache/druid
master
Apache License 2.0
13,213
2012-10-23T07:08:07
druid
java
{'merge_commit_hash': '079debd35daa13a73504ed5a1d63b946d0fe996d', 'parents': ['5efe3fbd84cf839a336b7d1f592f48cc57c834fc', 'c19cd23e94ea87648f6f205b05036fe745ec6a8c'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['sql/src/main/java/io/druid/sql/calcite/rel/DruidSemiJoin.java']}
merge
huge
easy
apache_rocketmq_spring_merge_0000
apache/rocketmq-spring
master
Apache License 2.0
2,037
2018-10-15T06:07:53
rocketmq
java
{'merge_commit_hash': 'ee37648d3bab51658ccf5896dbc8afce751eaa03', 'parents': ['4e5d974e17d4e464938dd68ace63603242b26c33', '327ef13383eccef34de0c41ed3e5f48aada21ef3'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/ExtRocketMQConsumerConfiguration.java', 'rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtConsumerResetConfiguration.java', 'rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfiguration.java', 'rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQProperties.java', 'rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java']}
merge
small
hard
apache_cloudstack_merge_0000
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': 'a1f547a011038296a2125586cbb8c8d18d249455', 'parents': ['1d1b33214162eb42870f7d543e7a96f433c60721', '56f0448f0d46e95f50047636000a73fc754fd0be'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java']}
merge
huge
medium
apache_groovy_merge_0000
apache/groovy
master
Apache License 2.0
5,098
2015-04-16T07:00:05
apache;compiler;dynamic-typing;functional-programming;groovy;jvm-languages;metaprogramming;programming-language;static-typing
java
{'merge_commit_hash': 'd21ddc7abe062ee643b5d6db8e209a9da50446fe', 'parents': ['a9c704665e249ac5c067e0d8037ab228a20fb3a9', '01fdb705c4ca0737949c4fd323b62736c27716a8'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java', 'src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java']}
merge
large
hard
wiremock_wiremock_merge_0000
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': 'f63b53927d90e49e39d0a79d21b955e883611aa7', 'parents': ['41365c4b7a9cbb511ee145b0c9686e412886af2f', '17e1c15a688874f39b9e299fbe25067ee5aae2af'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['src/main/java/com/github/tomakehurst/wiremock/common/JettySettings.java', 'src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java', 'src/test/java/com/github/tomakehurst/wiremock/common/JettySettingsTest.java']}
merge
medium
hard
batfish_batfish_merge_0000
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': '1e2cd73368535f5fe285369411e10f29e91f7642', 'parents': ['a49a0772cb112cb562a8a469a8904d538a7bfd56', 'c0533041818b79bb82eeed442624ff38c3c5c45d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['projects/batfish/src/main/java/org/batfish/bddreachability/PacketPolicyToBdd.java']}
merge
large
medium
confluentinc_kafka_streams_examples_merge_0000
confluentinc/kafka-streams-examples
master
Apache License 2.0
2,288
2017-08-18T10:07:36
unavailable
java
{'merge_commit_hash': 'a2b04202407a8ff26bba5d45854774d908dd5d1b', 'parents': ['e6744c3b8b436cadd9072934f4a9020767dee40c', 'b55510b1112ae6570ee98bb6c4c8b7056e037894'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/main/java/io/confluent/examples/streams/SessionWindowsExample.java', 'src/main/java/io/confluent/examples/streams/interactivequeries/kafkamusic/KafkaMusicExample.java', 'src/test/java/io/confluent/examples/streams/SessionWindowsExampleTest.java']}
merge
medium
hard
apache_kafka_merge_0000
apache/kafka
trunk
Apache License 2.0
27,504
2011-08-15T06:06:16
kafka;scala
java
{'merge_commit_hash': '830a9e9215141fe172ad65ed93c21cb8ce532d08', 'parents': ['bad1d735a92e54c04929c9e5880c1bf90fb9f1b4', 'cfe5ab5cf23543392a240a7abc38279f343501c3'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['storage/src/test/java/org/apache/kafka/tiered/storage/utils/TieredStorageTestUtils.java']}
merge
large
easy
mockito_mockito_merge_0000
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': 'a41555013e1f19a7f95e364b6abbc027aeaff5da', 'parents': ['da123e56a1b3560fc03cef4e7917319dfb722d03', '90937734c3cf467de7f672fcd3dc21e42b3d2146'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['src/main/java/org/mockito/AdditionalAnswers.java', 'src/main/java/org/mockito/internal/MockitoCore.java', 'src/main/java/org/mockito/internal/stubbing/answers/AnswersWithDelay.java', 'src/test/java/org/mockito/internal/stubbing/answers/AnswersWithDelayTest.java']}
merge
medium
hard
google_gson_merge_0000
google/gson
main
Apache License 2.0
23,000
2015-03-19T06:21:20
unavailable
java
{'merge_commit_hash': '69173b02eaa82de0382d94478a1b4cdeafeca829', 'parents': ['a4a235e14a63b9a4f902805641f1160c6bf5aa93', '03be83591467afc368608e80a03f9d6a0e9720fd'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['gson/src/main/java/com/google/gson/internal/$Gson$Types.java', 'gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java']}
merge
medium
hard
cgeo_cgeo_merge_0000
cgeo/cgeo
master
Apache License 2.0
1,365
2011-07-11T06:02:47
android;cgeo;geocaching;opencaching
java
{'merge_commit_hash': '31f6af469afbed3d4ecdd8597eb61dd0b1f976d3', 'parents': ['c926353e0db2a12aa6266f4cad3688e56db1149e', 'b2ca9bc3d15f2edc6a90de29c31b526b92668056'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['main/src/main/java/cgeo/geocaching/unifiedmap/UnifiedMapActivity.java', 'main/src/main/java/cgeo/geocaching/unifiedmap/geoitemlayer/MapsforgeVtmGeoItemLayer.java']}
merge
large
hard
mongodb_mongo_java_driver_merge_0000
mongodb/mongo-java-driver
master
Apache License 2.0
2,595
2009-01-15T03:16:29
database;java;java-library;jvm;kotlin;kotlin-coroutines;kotlin-library;mongodb;scala
java
{'merge_commit_hash': 'b4b2e88d69dd0937265b77a362d8950fad6a2f8e', 'parents': ['d0941fc6f7bbec83e9c82ab7b6eccb498ff60a1f', '68b54b2f438aec1ebf1b1f2eca37f98333d5b8ea'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['driver-sync/src/main/com/mongodb/client/gridfs/GridFSDownloadStreamImpl.java', 'driver-sync/src/main/com/mongodb/client/gridfs/GridFSUploadStreamImpl.java']}
merge
large
hard
dropwizard_metrics_merge_0000
dropwizard/metrics
release/4.2.x
Apache License 2.0
7,803
2010-02-26T07:44:42
dropwizard-metrics;java;metrics;metrics-library
java
{'merge_commit_hash': 'a3058d593fbc22de098a6a18eefecdb4678618e2', 'parents': ['b05da8c23427058b07f7468d390620d0d619940a', '0fb0b3e8c378c111d9c76ffdd2e3d1cae09e8bc9'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['metrics-jmx/src/main/java/io/dropwizard/metrics5/jmx/DefaultObjectNameFactory.java']}
merge
medium
easy
baomidou_mybatis_plus_merge_0000
baomidou/mybatis-plus
3.0
Apache License 2.0
15,868
2016-08-18T10:06:53
mybatis;mybatis-plus;mybatis-spring;mysql;orm;orm-framework;postgresql;toolkit
java
{'merge_commit_hash': 'd03188f2e751109926c19d7ba3abde08e53bd035', 'parents': ['22dd565a0db3d6d3df434ddb4f7004a61a94a64c', '3feead7c91b22a0ac56f491151d0db998ddcbfe4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java']}
merge
medium
medium
spring_projects_spring_graphql_merge_0000
spring-projects/spring-graphql
main
Apache License 2.0
1,493
2020-07-20T04:35:00
graphql;spring-graphql
java
{'merge_commit_hash': '320bce7348dcc1fadee9af74f2a0400d1e6ed55c', 'parents': ['abcc38428d39a0f2f8ac946f40b9018cff6bac9a', '33bdea95567e5b24b39bbdcc5b65adc193db98ed'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['spring-graphql/src/main/java/org/springframework/graphql/data/method/InvocableHandlerMethodSupport.java', 'spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/DataFetcherHandlerMethodTests.java']}
merge
medium
hard
graphql_java_graphql_java_merge_0000
graphql-java/graphql-java
master
MIT License
6,037
2015-07-06T06:52:20
graphql;graphql-java;java
java
{'merge_commit_hash': '25dfe4b9dd6eb6792c69128bdcd970dd2b6433ee', 'parents': ['b16deb407ecea2e02703cf56b6a720704ed46fc4', 'bc2e2d23d6f04ef9d5d4cb27f608870e7b416a24'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/main/java/graphql/execution/ExecutionStrategy.java', 'src/main/java/graphql/execution/instrumentation/dataloader/FieldLevelTrackingApproach.java']}
merge
large
hard
cloudfoundry_uaa_merge_0000
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': '9a42505906c99e9dc7e5d58ccedbd0a351ed24a5', 'parents': ['6caf12c7b992000c0073b484149bb785a4f3fea9', 'c0111413928ae9b6c84ffdaeb184bd69e9a4457e'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioning.java', 'server/src/test/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioningTests.java']}
merge
large
hard
reactor_reactor_core_merge_0000
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': 'aec13da69deb156f29c59d93981c15a019b8d545', 'parents': ['115f3f6f069e51ce11edc6205c4d578015fea977', '0bfa6ee8be869f1fc3ca37262db186442137d9b9'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['reactor-core/src/test/java/reactor/core/publisher/FluxBufferTimeoutTest.java']}
merge
large
easy
openrewrite_rewrite_merge_0000
openrewrite/rewrite
main
Apache License 2.0
1,907
2020-05-12T08:16:14
abstract-syntax-tree;ast;code-search;java;refactoring;refactoring-tools
java
{'merge_commit_hash': '61ef7725ef6ddaa15f2801f402d4aabcf07884f5', 'parents': ['66cbbc4ec286cf695a4e6031470a5905b28d1a54', 'efc2480c740e388def0966d87962eaa54abcfe9f'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['rewrite-core/src/main/java/org/openrewrite/InMemoryExecutionContext.java', 'rewrite-core/src/main/java/org/openrewrite/scheduling/WatchableExecutionContext.java']}
merge
large
hard
redis_jedis_merge_0000
redis/jedis
master
MIT License
11,663
2010-06-11T01:04:43
java;jedis;redis;redis-client;redis-cluster
java
{'merge_commit_hash': '6ffdcba0455f9aae1e8d1e09748c38dd773d1fc1', 'parents': ['67073275504bb0708da6022e9c67985a1a159b34', 'a19bd20322663de6769e98cbb3fb740d4f9effb3'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['src/main/java/redis/clients/jedis/CommandArguments.java', 'src/main/java/redis/clients/jedis/Protocol.java']}
merge
large
hard
apache_flink_merge_0000
apache/flink
master
Apache License 2.0
23,256
2014-06-07T07:00:10
big-data;flink;java;python;scala;sql
java
{'merge_commit_hash': '25c6b89e116825607b16cbbe1af9bf0f89c00645', 'parents': ['5efd24167a5d249cf4942464818e7a029aba38a8', '22e5179c376e18f0d8fcc334d4fa0d4019549f15'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['pact/pact-compiler/src/main/java/eu/stratosphere/pact/compiler/plan/WorksetIterationNode.java']}
merge
huge
easy
slimeknights_tinkersconstruct_merge_0000
slimeknights/tinkersconstruct
1.19.2
MIT License
1,193
2013-01-22T08:46:32
unavailable
java
{'merge_commit_hash': 'a015f28e8e3a841e8f1156fbe27dc364af062289', 'parents': ['710326119131a7491b5040a0f4992ebf8abb24cc', '7e5cf1203308da7f4db76e5465c113a99f40a2e2'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/slimeknights/tconstruct/tools/modifiers/traits/skull/BoonOfSssssModifier.java', 'src/main/java/slimeknights/tconstruct/tools/modifiers/traits/skull/StrongBonesModifier.java']}
merge
large
hard
apache_phoenix_merge_0000
apache/phoenix
master
Apache License 2.0
1,014
2014-06-04T07:00:08
database;hbase;java;phoenix;sql
java
{'merge_commit_hash': '18bea3907ef73c6f842ac5410ea4623be5a36b18', 'parents': ['45e6b0e309d037c03221de249501fa7c4bc651db', '4082c73ee23d901642d8c5bc45ececfcf5e50ede'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java']}
merge
large
easy
clickhouse_clickhouse_java_merge_0000
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': 'dd7d4f54fed4b59f0f6e4e202af71308db5bb1fc', 'parents': ['1378092cd530ca4a70dd8afd048e278d816c558f', '5dc8e67576e8561734be2047f62f68738cd84a46'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java']}
merge
large
easy
jazzband_django_debug_toolbar_merge_0000
jazzband/django-debug-toolbar
main
BSD 3-Clause New or Revised License
7,934
2008-08-28T06:58:04
unavailable
python
{'merge_commit_hash': '347b223eec48cb08ff7c9fc930be07551ef41dfc', 'parents': ['78da08ef3fdcf213617bf090fb1033fa2e43b991', 'ff190fffc302e34fe0127cd2d81e8362db3be1b1'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['tests/panels/test_sql.py']}
merge
medium
easy
zenml_io_zenml_merge_0000
zenml-io/zenml
main
Apache License 2.0
3,695
2020-11-19T09:25:46
ai;automl;data-science;deep-learning;devops-tools;hacktoberfest;llm;llmops;machine-learning;metadata-tracking;ml;mlops;pipelines;production-ready;pytorch;tensorflow;workflow;zenml
python
{'merge_commit_hash': 'd97fc9744bfee2e0044699ff11a681b19aa8007a', 'parents': ['fd8d526753d6370f893e5c88b8b650b92d69b1e8', '7f75d5f6155a5c13b4d66404615b5c391623ba75'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/zenml/integrations/kubeflow/orchestrators/kubeflow_orchestrator.py', 'src/zenml/zen_server/exceptions.py']}
merge
large
hard
fairlearn_fairlearn_merge_0000
fairlearn/fairlearn
main
MIT License
1,821
2018-05-15T01:51:35
ai;ai-systems;artificial-intelligence;fairness;fairness-ai;fairness-assessment;fairness-ml;group-fairness;harms;machine-learning;responsible-ai;unfairness-mitigation
python
{'merge_commit_hash': '14fba826f537e5c9d0b6626a8fb59d445a0d5dec', 'parents': ['4af09c8043f3259b556a5eb10ed0a1d292218d53', '794d49a6d56ef31e63abd11326b2c865226ec9b5'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['test/unit/metrics/test_group_sklearn_wrappers.py']}
merge
medium
easy
zenml_io_zenml_merge_0001
zenml-io/zenml
main
Apache License 2.0
3,695
2020-11-19T09:25:46
ai;automl;data-science;deep-learning;devops-tools;hacktoberfest;llm;llmops;machine-learning;metadata-tracking;ml;mlops;pipelines;production-ready;pytorch;tensorflow;workflow;zenml
python
{'merge_commit_hash': '51ab7385a8cd282d509b42531bfed9b8871e9bac', 'parents': ['d216c662fb65e5abfaad6729b0f2d826f0611408', '12bad0d1fb0915bba7eb454ca1e8d6c9de214179'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/zenml/integrations/gcp/orchestrators/vertex_orchestrator.py']}
merge
large
easy
joaomdmoura_crewAI_merge_0000
joaomdmoura/crewAI
main
MIT License
13,471
2023-10-27T03:26:59
agents;ai;ai-agents;llms
python
{'merge_commit_hash': 'cbf5d548be8a59c64c75d5233d842aba1a046b67', 'parents': ['a7a2dfd29608943f9ec62fd1364373c578a22272', 'dc4911b1ca803ef8754cfe5ce31763c0088b5f79'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/crewai/crew.py']}
merge
large
easy
lyft_cartography_merge_0000
lyft/cartography
master
Apache License 2.0
2,883
2019-02-27T12:16:29
lyft
python
{'merge_commit_hash': 'ff1e81543b8f2ed50260e7abfd37800ab0e103a2', 'parents': ['e1cf14a69ce1f2fce18bb30ec86dea4de3098773', '7391521c11576e77e6936b040d08687ae22d73ef'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['cartography/intel/aws/__init__.py']}
merge
medium
easy
vainf_torch_pruning_merge_0000
vainf/torch-pruning
master
MIT License
2,359
2019-12-15T03:07:24
channel-pruning;cvpr2023;depgraph;efficient-deep-learning;model-compression;network-pruning;pruning;structural-pruning
python
{'merge_commit_hash': 'ad3818db7cb9cf28a6b4c472d89f31f9a8d94dea', 'parents': ['dfce3518e3468a6560cd288a561988a19960730b', '7559ce7ad9410bc7a122d5e989ccf8c2c4305e6b'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['tests/test_regularization.py', 'torch_pruning/pruner/importance.py']}
merge
medium
hard
alibaba_spring_cloud_alibaba_merge_0000
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': 'f2f58b90a056bc8f4e21f738d458ad8d97eb3aa1', 'parents': ['0a89ad61e19f65a93d4c5d503381da58af3f8867', 'bc657f6677e3728f2d4710da8462842c8486ae78'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java']}
merge
medium
easy
ebean_orm_ebean_merge_0001
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': '006ad79379d317038f83688fd3c5cc808942ccb9', 'parents': ['6645e5b9ec44ac2c1a944e418b61f5b84545f5cc', '0e063549cdedda57499aa16e482e28f72b0e9fca'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java']}
merge
large
medium
gitlab4j_gitlab4j_api_merge_0000
gitlab4j/gitlab4j-api
main
MIT License
1,022
2014-02-18T05:09:14
gitlab;gitlab-api;gitlab4j-api;hacktoberfest;java;java-gitlab-api
java
{'merge_commit_hash': 'dc944e1db2d870f215a74a1f9033d14441b297fb', 'parents': ['3067b34620a2abe41975cedb5c53c087937d1085', '55d3f92771632c33afbe551a19fa6bb9d5b1ba5e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/org/gitlab4j/api/GroupApi.java']}
merge
medium
easy
648540858_wvp_gb28181_pro_merge_0000
648540858/wvp-gb28181-pro
master
MIT License
4,445
2020-11-14T02:16:37
28181;28181web;gb28181;gb28181server;wvp
java
{'merge_commit_hash': '261945ca62d402f0a41b76c51ed99ddc911748ca', 'parents': ['ff975b47bacfdfc75d625ad59a0ee89c83170569', '70e6d919e9011688653627fdffa64c94d6109341'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java']}
merge
medium
easy
apache_plc4x_merge_0000
apache/plc4x
develop
Apache License 2.0
1,170
2017-12-20T08:00:09
ab;ads;bacnet;c;can;cpp;ethernetip;firmata;go;iot;java;knx;modbus;net;opcua;python;s7;siemens
java
{'merge_commit_hash': 'f565ff17f0095932a04c02c7af3d5d00f21887bf', 'parents': ['2a138284afe29135c1051c37d597cd9cd6c6c7e8', '3cadde706b6e6e5f4febb00e9edbb1623f001670'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/readwrite/protocol/EipProtocolLogic.java']}
merge
huge
easy
swagger_api_swagger_core_merge_0000
swagger-api/swagger-core
master
Apache License 2.0
7,347
2011-07-05T11:44:11
java;open-source;openapi;openapi-specification;openapi3;rest;rest-api;swagger;swagger-api;swagger-oss
java
{'merge_commit_hash': '02a41f8d4d1aa7adf436db6c44ea02c871b8cca7', 'parents': ['1f35e779ddbbdf832d5efb8de432d8ccd5d09bd8', '0543bda2305b51c0ef4b2b830fb02ed7b674d411'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/enums/SecuritySchemeType.java', 'modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/media/Schema.java', 'modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java']}
merge
medium
hard
alibaba_fastjson2_merge_0000
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': '49ecf3bf30dd34659329dd3dbab02b479e6e82ea', 'parents': ['2ee0408498a94befd5dcddb34ba12c1210a1c5b1', '321837d8c00e59f6cd9c8fc2854d1e847e1a0c1f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterImplCollection.java']}
merge
huge
easy
clickhouse_clickhouse_java_merge_0001
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': '3fd910fd6cf8b5fbc643e12da84c034f0e13a567', 'parents': ['9b229b9e34343d1c410ad0615636bd9c653c110c', 'e589c2f1ac29699320a087e940dbbe43f63f85be'], '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
pentaho_pentaho_kettle_merge_0000
pentaho/pentaho-kettle
master
Apache License 2.0
7,409
2013-10-08T06:27:11
unavailable
java
{'merge_commit_hash': '507b09855b83e09232f3e909c2499a3d28504b8f', 'parents': ['2c760d261f0a956fcdcd4ced44323c328dfe161e', '8e813b2f3ad1eea3ac3ef300819eab57ac948492'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['plugins/oracle-bulk-loader/ui/src/main/java/org/pentaho/di/ui/trans/steps/orabulkloader/OraBulkLoaderDialog.java', 'ui/src/main/java/org/pentaho/di/ui/job/entries/createfile/JobEntryCreateFileDialog.java', 'ui/src/main/java/org/pentaho/di/ui/job/entries/exportrepository/JobEntryExportRepositoryDialog.java']}
merge
huge
hard
apache_tika_merge_0000
apache/tika
main
Apache License 2.0
2,183
2009-05-21T02:12:11
content;extraction;java;metadata;tika
java
{'merge_commit_hash': 'cb1bbc052188bf5e45e5dc17570180df1fe27df9', 'parents': ['56ff337b65a5ee66c582ad0e877c6bc583bc3adf', '5ae7cc5d59006e15baa3347954e0545468c0dc94'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['tika-core/src/main/java/org/apache/tika/fork/ForkClient.java', 'tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java']}
merge
large
hard
wildfly_wildfly_merge_0000
wildfly/wildfly
main
Apache License 2.0
3,000
2010-07-08T08:46:07
hacktoberfest
java
{'merge_commit_hash': 'b4a48ae63ad49086bea6479657c503a09af206ad', 'parents': ['d55850c927396c02e2f7dd1019e6e83d95af17bd', '1b6758d3d9f218f67f309497c5268ce55703db96'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['testsuite/shared/src/main/java/org/jboss/as/test/shared/observability/setuptasks/OpenTelemetrySetupTask.java']}
merge
large
easy
reactor_reactor_netty_merge_0000
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': '7134e306830d855f093f37486a6d4bfda5ab649d', 'parents': ['ad5817c9a4b749b49c7960ae14541996742e82b9', '8c333ba9cdc37c88ed0bef6407b5724ac0a5ed31'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['reactor-netty-http/src/test/java/reactor/netty/http/server/HttpServerTests.java']}
merge
medium
medium
bucket4j_bucket4j_merge_0000
bucket4j/bucket4j
master
Apache License 2.0
2,168
2014-10-12T02:19:18
apache-ignite;hazelcast;infinispan;jcache;oracle-coherence;rate-limit;rate-limiter;rate-limiting;token-bucket
java
{'merge_commit_hash': '9150817f0a0899a67b5dee2e1469dc3b3a1727f6', 'parents': ['ba714de174c8750ec6acbd18552b8d6541659186', '4cbc154c16dd5e5a94d7448fe8c0415e1d5a81da'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 8, 'files_in_merge_conflict': ['bucket4j-core/src/main/java/io/github/bucket4j/distributed/proxy/optimizers/batch/sync/BatchingExecutor.java', 'bucket4j-core/src/main/java/io/github/bucket4j/distributed/proxy/optimizers/batch/sync/TaskQueue.java', 'bucket4j-core/src/main/java/io/github/bucket4j/distributed/proxy/optimizers/batch/sync/WaitingTask.java']}
merge
medium
hard
google_closure_compiler_merge_0000
google/closure-compiler
master
Apache License 2.0
7,262
2014-04-16T03:30:36
closure-compiler;javascript;optimization;typechecking
java
{'merge_commit_hash': 'cb8e475631093ddac713817e378b3536bfc88fe1', 'parents': ['19b5d5442d4ed8c6b54c1b6cefa3773fff621048', 'a781ce8a3492b8deab233b1876b164d3bd20639d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['test/com/google/javascript/jscomp/IntegrationTest.java']}
merge
large
easy
testcontainers_testcontainers_java_merge_0001
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': '866c45845396bb96952999ab1d1331b412255d4a', 'parents': ['b77d868c29ffdd54a5e46f867c6fa27ecf3eb3ac', 'd604f3ec45c9c61574b1728b801b70dba35eaa18'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java']}
merge
medium
easy
magefree_mage_merge_0001
magefree/mage
master
MIT License
1,772
2012-04-27T01:18:34
ai;card;ccg;client-server;computer-opponents;deck;game;game-engine;java;linux;macos;magic;magic-the-gathering;mtg;mtgjson;multiplayer;scryfall;windows;xmage
java
{'merge_commit_hash': 'd51120184479c7eb0a4ef31a460f621fbd226d36', 'parents': ['71d57c83d22cd190f44040740e7cb8646599e01f', '711c34b34f61fc01438ed64a1203fec9991ff8d4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['Mage.Sets/src/mage/sets/FourthEdition.java']}
merge
huge
medium
alluxio_alluxio_merge_0001
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': '864e397c59af4bb9190d6e8dad9aa8c0a15f26b3', 'parents': ['ea6587423372fd34ca8ead68eaf4dd6ec0667d22', '57c078cf47f872db5c610270633b4bb3cd835c20'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['core/common/src/main/java/alluxio/AbstractMasterClient.java', 'core/server/common/src/main/java/alluxio/master/journal/checkpoint/CheckpointName.java']}
merge
large
hard
ebean_orm_ebean_merge_0002
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': 'e199a25ca8fcabf0733729e8c7e8e072474954fd', 'parents': ['0e24e78e9c934c5cbef6d59f23ed69d0ea88aa85', 'edbd13c0754ed23fc8e4958a1f43dbc76c09026a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java']}
merge
large
easy
openrewrite_rewrite_merge_0001
openrewrite/rewrite
main
Apache License 2.0
1,907
2020-05-12T08:16:14
abstract-syntax-tree;ast;code-search;java;refactoring;refactoring-tools
java
{'merge_commit_hash': 'd1cffc1ce5dfe4526c741a0784a3b18464e2fcff', 'parents': ['5c762318edc5c7e554b47e61504f783f51d04037', '3bd8271be963c025ce0856072d0f09360e3184cd'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['rewrite-xml/src/main/java/org/openrewrite/xml/tree/Xml.java']}
merge
large
easy
openhft_chronicle_queue_merge_0000
openhft/chronicle-queue
ea
Apache License 2.0
3,170
2013-06-02T03:11:33
chronicle;java;low-latency;performance;persistance;queue
java
{'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']}
merge
medium
medium
micrometer_metrics_micrometer_merge_0000
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': '72cda3ef6117fe29aaa1af8594a9d484243d201b', 'parents': ['c26ebfbf8054418975a281085621155ec5f709d9', 'b1dd400e8fca52488e5943b287cba3777dde5455'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['micrometer-core/src/main/java/io/micrometer/core/aop/CountedAspect.java', 'micrometer-core/src/main/java/io/micrometer/core/aop/TimedAspect.java', 'micrometer-observation/src/main/java/io/micrometer/observation/aop/ObservedAspect.java']}
merge
medium
hard
embulk_embulk_merge_0000
embulk/embulk
master
Apache License 2.0
1,727
2014-09-16T03:58:52
bulk-loader;embulk
java
{'merge_commit_hash': 'b7f9f28d584dbd84ea3bd8bb36f2a719205dd6b1', 'parents': ['a064e8ae864b6899304c2d20a59a7201e31f409d', '401f848ee5ebb0649e1f38625a15c6582ff2b7a8'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['embulk-core/src/main/java/org/embulk/exec/SamplingParserPlugin.java', 'embulk-core/src/main/java/org/embulk/spi/FilterPlugin.java']}
merge
medium
hard
apache_ignite_merge_0000
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': '9c3028a6414bf7c94a9550b40cc40a7da72d34e0', 'parents': ['13c5a5f37a448c5fde66538ff522ff2582db6146', 'a0fc2b0e6ab8903bd3007c5915c1a5fea9d43985'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java']}
merge
huge
easy
apache_tinkerpop_merge_0000
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': 'f30fa83477a8c6b473024f7dd983e966f4e17935', 'parents': ['504cd900f4a7b814f6f1986e1f7afcf23b101d1b', 'b7c814e783f6a38b5975004d00d31a5f7d51263b'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java', 'gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java']}
merge
large
hard
spring_cloud_spring_cloud_netflix_merge_0000
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': '53ede01f5e9071d12cfa5911814f781bb9245900', 'parents': ['62363587e0188ddde4706ef6a062bf4166bf5d79', 'f55c95b5f38800791462563b88dcb135a30e1585'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RetryableRibbonLoadBalancingHttpClient.java', 'spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClientTests.java']}
merge
medium
hard
apache_rocketmq_merge_0000
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': '3cd0ec9a8349a3a89a135b581ed1b2e2bc10a167', 'parents': ['a44699acd6eafe09e8d78d5c9fecded62134dcdf', '8fc952d20c5b265e2d652fb556999a8e9f8df1a8'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java']}
merge
large
medium
fabric8io_kubernetes_client_merge_0000
fabric8io/kubernetes-client
main
Apache License 2.0
3,318
2015-07-09T03:43:13
dsl;java;java-client;kubernetes;kubernetes-client;kubernetes-model;mock-server;mocking-kubernetes;openshift;openshift-client
java
{'merge_commit_hash': '3fb4a2edf71ca1315a2545c540772f8b66eb1067', 'parents': ['f90b96eb7dae7b8496083f4c62736b61d74fdb31', '253df52df2d56fc45105900b04cf775186ff3240'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['kubernetes-client/src/main/java/io/fabric8/kubernetes/client/internal/readiness/Readiness.java']}
merge
huge
easy
kairosdb_kairosdb_merge_0000
kairosdb/kairosdb
develop
Apache License 2.0
1,728
2013-02-05T10:27:48
java;kairosdb;metrics;timeseries;timeseries-database
java
{'merge_commit_hash': '35704ec1a2902554b6068676ff9ac7e6bb80f87a', 'parents': ['43393dda90ca42fed961802dbcc93b7412aa8943', '4177388e35d5db8354b7837bd40e611640c19190'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/org/kairosdb/core/aggregator/RangeAggregator.java']}
merge
large
medium
apache_beam_merge_0000
apache/beam
master
Apache License 2.0
7,569
2016-02-02T08:00:06
batch;beam;big-data;golang;java;python;sql;streaming
java
{'merge_commit_hash': '60bd66736a1d9ca118419a7c4502083cfd00cd0e', 'parents': ['7e29ef21abad327d0b7dc5d5221bc8cd4cb799b2', '152626396c7a421093f9c8fb3b646a2e4776dd38'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['sdks/python/apache_beam/dataframe/frames.py', 'sdks/python/apache_beam/dataframe/frames_test.py']}
merge
huge
hard
apache_cassandra_merge_0001
apache/cassandra
trunk
Apache License 2.0
8,538
2009-05-21T02:10:09
cassandra;database;java
java
{'merge_commit_hash': '5f54d64c78818125f47ecc509a757f4b55fcc893', 'parents': ['8bb9c72f582de6bcc39522ba9ade91fd5bc22f67', '92245b0f07cda20d08a29bf5912018867ed16779'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/java/org/apache/cassandra/config/YamlConfigurationLoader.java']}
merge
huge
medium
apache_phoenix_merge_0001
apache/phoenix
master
Apache License 2.0
1,014
2014-06-04T07:00:08
database;hbase;java;phoenix;sql
java
{'merge_commit_hash': '86ba54583493a17ea63f40d5f0f7a907a972b19c', 'parents': ['ade4d639ce680bcfa0821bf78ff2a4192ae5ccde', '48d712ca41aa8b2efe353c3f31618b14f95a4d18'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java', 'phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java']}
merge
large
hard
spring_projects_spring_boot_merge_0000
spring-projects/spring-boot
main
Apache License 2.0
73,085
2012-10-19T03:02:57
framework;java;spring;spring-boot
java
{'merge_commit_hash': 'd2e202edb0e4ad9bb26703730b18e3ea7020367e', 'parents': ['63db9a74bea568f7d822c92a0b46f0928d6b32a5', '41a796010fc1592218b7ccfd545e4d66de180b06'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java']}
merge
large
easy
apache_rocketmq_spring_merge_0002
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_cassandra_merge_0002
apache/cassandra
trunk
Apache License 2.0
8,538
2009-05-21T02:10:09
cassandra;database;java
java
{'merge_commit_hash': 'e538df5e50905e71882e6fbacd835ad333190dba', 'parents': ['49a0f0111c241855823ed6ab3f751691177f4a7a', '4c3b42612037a74cb7095bdc8485ff42f747b2b4'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java', 'test/distributed/org/apache/cassandra/distributed/impl/RowUtil.java']}
merge
huge
hard
apache_ignite_merge_0002
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': 'c089bcc59dfd0bc91de91233b6fcd2acd22edae5', 'parents': ['26b8c55188ed399d235bd64e84f5b9896d0fda00', 'f2c58ab0f68b5e5f0b368401601c971c34242fba'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java']}
merge
huge
medium
msgpack_msgpack_java_merge_0000
msgpack/msgpack-java
main
Apache License 2.0
1,382
2011-06-29T08:45:39
unavailable
java
{'merge_commit_hash': 'a839b888e900811d5f11e77b066271e901c031fc', 'parents': ['4f5b594e2ac31985165185c7f1d020549f2d9b48', '5e989d93a86faac287013f78981b2368ea51c91e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['msgpack-core/src/main/java/org/msgpack/core/MessagePack.java']}
merge
medium
medium
killbill_killbill_merge_0000
killbill/killbill
master
Apache License 2.0
4,400
2012-10-21T08:55:05
billing;killbill;payments;subscriptions
java
{'merge_commit_hash': '32c17b6d6a60629a398b653cec5e8540331de105', 'parents': ['e188812c1379351a2639f63517436fe56e6f18e6', 'b3223b4ee5eb06bbbfef16dc4196f89757195610'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java', 'invoice/src/main/java/org/killbill/billing/invoice/usage/ContiguousIntervalUsageInArrear.java']}
merge
large
hard
spring_cloud_spring_cloud_config_merge_0001
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': 'ed0c170b41836e2a270408c60596903bb0d14a8e', 'parents': ['1b748ca048fb7e47d11a874acd3148b8c8731448', 'e9c8570803dc87af08eba2afb29bdcbc3c968669'], '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/ssh/FileBasedSshTransportConfigCallback.java']}
merge
medium
easy
fasterxml_jackson_databind_merge_0000
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': '3f15244f3d53de8f26d2976f19d1055193bca301', 'parents': ['c7bfa10e90c8aee0154ab7482064bf4712cd364a', 'f49a58e44fbfcd83f077ee2ee486181b06cb7491'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/tools/jackson/databind/DeserializationFeature.java']}
merge
large
easy
apache_camel_merge_0000
apache/camel
main
Apache License 2.0
5,333
2009-05-21T12:25:36
camel;integration;java
java
{'merge_commit_hash': '011e4ec57fcd700ed3e368e3f414233c09df2b1d', 'parents': ['712378ab35a860e2c197502bf65232f38c3dee02', '1e16019e39c151aed5aec0e6a50805bfb27f315e'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/fatjarroutertests/StandaloneFatJarRouterTest.java', 'tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java']}
merge
huge
hard
cgeo_cgeo_merge_0001
cgeo/cgeo
master
Apache License 2.0
1,365
2011-07-11T06:02:47
android;cgeo;geocaching;opencaching
java
{'merge_commit_hash': 'e2bad255cd14d797d6b76425f7d429c58d766f24', 'parents': ['1d34e962a1562446a380a0d22a4357e41098b4c1', '3a9d6fa1746e5ce0e11b86be724f530e9ce8f44f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['main/src/main/java/cgeo/geocaching/maps/google/v2/GoogleMapView.java']}
merge
large
easy
spongepowered_spongeapi_merge_0000
spongepowered/spongeapi
api-10
MIT License
1,131
2014-09-07T08:39:25
api;gradle;hacktoberfest;java;minecraft;sponge;spongeapi;spongepowered
java
{'merge_commit_hash': '163164f0a38be6b111f797814a69367d5a4aa04b', 'parents': ['bde75c74b7fd037468f173fbec0715ed355b6806', '6c4519902232d003cc3966b7da9731e89be80679'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/org/spongepowered/api/data/Keys.java']}
merge
medium
easy
datalinkdc_dinky_merge_0000
datalinkdc/dinky
dev
Apache License 2.0
2,855
2021-06-09T07:11:26
datalake;datawarehouse;flink;flinkcdc;flinksql;olap;real-time-computing-platform;sql
java
{'merge_commit_hash': '37475ad7e029393a389daf79afebc667af360830', 'parents': ['efda8d4c6f1e123d1eaa46c7cfe5fd9dce8400b7', 'ec1abfe1fcc46b0412c3568b7100e829a53e4f67'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['dinky-core/src/main/java/org/dinky/job/builder/JobUDFBuilder.java']}
merge
large
medium
jenkinsci_kubernetes_plugin_merge_0000
jenkinsci/kubernetes-plugin
master
Apache License 2.0
2,246
2015-02-16T09:02:22
agent;cloud;kubernetes
java
{'merge_commit_hash': 'c2c5f2e2d423360d76932d530432b6683a12a5d2', 'parents': ['591888bb2a22a40d5239647e0caab2483dae68da', 'bb533b99ae396b0226835931735680fd54688bfb'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java']}
merge
medium
medium
spring_projects_spring_data_elasticsearch_merge_0000
spring-projects/spring-data-elasticsearch
main
Apache License 2.0
2,869
2013-04-29T02:27:38
unavailable
java
{'merge_commit_hash': '7e9f12cc9c75de7314e1094a45df9d3ae873c8a9', 'parents': ['5a34a905861cebad0642e17e99c9a4ea352221ab', 'bb81fa75dbacbd72af29e921cf84f8e6b35d9549'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/org/springframework/data/elasticsearch/client/TransportClientFactoryBean.java', 'src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntity.java']}
merge
medium
hard
apache_pinot_merge_0000
apache/pinot
master
Apache License 2.0
5,166
2014-05-19T11:27:48
java
java
{'merge_commit_hash': '82f2d06bb4eb45f6c55336eef7a97dc187faf570', 'parents': ['43bbec839f44d3264f33dad967f9529772c6cb79', 'e46f0cbf2d42949aca121a9096e5fe8a1bdaa5c8'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['thirdeye/thirdeye-pinot/src/main/java/com/linkedin/thirdeye/anomaly/merge/AnomalyMergeExecutor.java', 'thirdeye/thirdeye-pinot/src/main/java/com/linkedin/thirdeye/dashboard/Utils.java', 'thirdeye/thirdeye-pinot/src/main/java/com/linkedin/thirdeye/dashboard/resources/DashboardResource.java']}
merge
large
hard
jenkinsci_jenkins_merge_0000
jenkinsci/jenkins
master
MIT License
22,483
2010-11-22T09:21:23
cicd;continuous-delivery;continuous-deployment;continuous-integration;devops;groovy;hacktoberfest;java;jenkins;pipelines-as-code
java
{'merge_commit_hash': '4d310ccbb868097739de1f6d16547c56fedad25b', 'parents': ['b530a609fb646a048511c88f9a94c7abd63ca83a', '0d1565bdaa26391646a90f60bc5878608b2ca01e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['core/src/main/java/hudson/logging/LogRecorderManager.java']}
merge
large
easy
apache_netbeans_merge_0000
apache/netbeans
master
Apache License 2.0
2,553
2017-09-01T07:00:11
code-editor;ide;java;netbeans;netbeans-platform
java
{'merge_commit_hash': 'cd6bfbc00a8ae58191e3c442492aa9e4fd5137bb', 'parents': ['3570583a79e4d0abf1b9a4bf82f85841a9f19cca', '13a7abb60c80b4086adc2ce44bb8ba28c6a6ee8d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java']}
merge
huge
easy
spring_projects_spring_graphql_merge_0002
spring-projects/spring-graphql
main
Apache License 2.0
1,493
2020-07-20T04:35:00
graphql;spring-graphql
java
{'merge_commit_hash': 'f9a34efe1f949038d0b47361b4a4bf100da44a5c', 'parents': ['dd2a3d21d54eb2e32dc253b31900bec2bc5ba384', 'aa1ee77867aee19bedef1f7eb5451fe46fc1c5e4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['spring-graphql/src/main/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandler.java']}
merge
medium
easy
fasterxml_jackson_databind_merge_0001
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': '325d651c7c1a7b3c37ac7dc8068e7614e0178b40', 'parents': ['2bfd020782c2b85275468f399ba35bc50def2e25', '4afceacea960d5339b796feae5cfbc2ed39e2033'], 'number_of_files_with_merge_conflict': 6, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['src/main/java/tools/jackson/databind/util/TokenBuffer.java', 'src/test/java/tools/jackson/databind/testutil/DatabindTestUtil.java', 'src/test/java/tools/jackson/databind/testutil/UnlimitedLookupCache.java', 'src/test/java/tools/jackson/databind/type/ContainerTypesTest.java', 'src/test/java/tools/jackson/databind/util/TokenBufferTest.java', 'src/test/java/tools/jackson/databind/util/UnlimitedLookupCache.java']}
merge
large
hard
connectbot_connectbot_merge_0000
connectbot/connectbot
main
Apache License 2.0
2,371
2009-02-06T05:52:35
android;connectbot;java;ssh;ssh-client;ssh2
java
{'merge_commit_hash': 'c1754664adc774d7884bc0ad680744fef45ba93a', 'parents': ['71b553c6edc0a7ed65821201d993881b7e7204c8', '84e2759b1ec87fac59581c0c33fe0cf6e293be74'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['app/src/main/java/org/connectbot/ConsoleActivity.java']}
merge
medium
easy
spring_cloud_spring_cloud_config_merge_0002
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': 'd3d258cbbfb4a33b709887a41a61aebb2e3b2848', 'parents': ['39c012767136534c4472ea7b22ba97e1f16800f7', '6ec9c432cb2c02840b85fdd8bcd0859eabc0ba46'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoaderTests.java']}
merge
medium
medium
sofastack_sofa_bolt_merge_0000
sofastack/sofa-bolt
master
Apache License 2.0
2,391
2018-04-09T03:29:36
java;netty;sofa-bolt;sofa-rpc;sofastack
java
{'merge_commit_hash': '070d4f9cdc3ab05ad754bb5252c31cc1e72fc0bf', 'parents': ['168e5bb5016b3d91a1cf0be48baa1030c4f4686d', 'c6088c2a273bb3a5e7109a50edbf4e1310c9b64f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/com/alipay/remoting/connection/AbstractConnectionFactory.java']}
merge
medium
easy
fasterxml_jackson_databind_merge_0002
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': '33ede5e3d5e0553c2bcdecb016c065ab9d63d2b6', 'parents': ['5b7b628102de2372a6c7a5969efa8749de3cf1ff', 'f59cb9a89fe8d3d4656c018ce764ac3f7fc5934b'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['src/main/java/tools/jackson/databind/deser/jdk/UntypedObjectDeserializer.java', 'src/test/java/tools/jackson/databind/deser/CustomObjectKeyDeserializer4680Test.java', 'src/test/java/tools/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java']}
merge
large
hard
gchq_gaffer_merge_0000
gchq/gaffer
develop
Apache License 2.0
1,737
2015-12-14T12:12:39
accumulo;aggregation;big-data;graph;graph-database;hadoop;hbase;parquet;spark
java
{'merge_commit_hash': 'd300881496a5bc67d11a5b8f1ec1b655cda7879c', 'parents': ['85419f888eeb4607a4551f092bcc891a999a2778', 'ca29a8a2fa6ec6ebda278996cd4c3a0637797ada'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/util/FederatedStoreUtil.java', 'store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreSchemaTest.java', 'store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/operation/handler/FederatedOperationHandlerTest.java']}
merge
large
hard
jabref_jabref_merge_0000
jabref/jabref
main
MIT License
3,415
2014-03-11T02:48:42
academia;academic-publications;biblatex;bibliography;bibtex;hacktoberfest;jabref;java;javafx;javafx-application;javafx-desktop-apps;javafx-gui;latex;reference-manager;research-tool
java
{'merge_commit_hash': '817f675f46cfed3f6bd4cd30fc319bd286b017a3', 'parents': ['a84044962c1ef8d67cf9cf928240132fdfcc042a', '5343c7c5dadd1482ef8f01057364e8e4d1a1156e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/org/jabref/gui/desktop/JabRefDesktop.java']}
merge
large
easy
apache_iotdb_merge_0000
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': 'c0fb1d9fc8659f4f50aa1dce34de98e5ecf71047', 'parents': ['b6bbb3a94bf704a085e32fd0bfab40e9453e8b0c', '9619aac1988ca426ae5a380f925b980477a40022'], '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/storageengine/StorageEngine.java']}
merge
large
easy
gitlab4j_gitlab4j_api_merge_0001
gitlab4j/gitlab4j-api
main
MIT License
1,022
2014-02-18T05:09:14
gitlab;gitlab-api;gitlab4j-api;hacktoberfest;java;java-gitlab-api
java
{'merge_commit_hash': '3c27dd063c70ffedb3f321821d429b563af52e23', 'parents': ['982f4b64dd258c49eb78a7feb2d4104f90bd2f81', 'ad6d8d4ff784fef4b9e3031cf34025fa29f3a29c'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/org/gitlab4j/api/models/Link.java', 'src/main/java/org/gitlab4j/api/models/PackageFile.java']}
merge
medium
hard
jetlinks_jetlinks_community_merge_0000
jetlinks/jetlinks-community
master
Apache License 2.0
5,084
2020-01-02T07:27:34
iot;iot-platform;java;jetlinks;mqtt;netty;r2dbc;reactive-streams;reactor;rule-engine;spring-boot;tcp;webflux;websocket
java
{'merge_commit_hash': 'e2b974a187c7e31ab1059b205ff60a8cab03cf73', 'parents': ['fdaef093622ac5508035e53092711edd49258a22', '20554909a4bb5495134c94645e6404865989633d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java']}
merge
medium
easy
killbill_killbill_merge_0001
killbill/killbill
master
Apache License 2.0
4,400
2012-10-21T08:55:05
billing;killbill;payments;subscriptions
java
{'merge_commit_hash': 'a97fc7c3b9ff1e2d4fa714ef597d8f8f0340050e', 'parents': ['ca0796f121318feb1806b67ae689f74d6ba35b44', '488a09bb308bae493d5301e57aedf7df989c1854'], '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/generator/FixedAndRecurringInvoiceItemGenerator.java']}
merge
large
easy
End of preview. Expand in Data Studio

Dataset Summary

GitGoodBench Lite is a subset of 17469 samples for collecting trajectories of AI agents resolving git tasks (see Supported Scenarios) for model training purposes. We support the programming languages Python, Java and Kotlin and the sample types merge conflict resolution and file-commit chain.

All data in this dataset are collected from 816 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.

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': '9bcf252fb11ec692dfbc152933dddd427098dcc9',
  'parents': ['5d5df76aa7df56bdbec07c18e063a1125cfd0465', '3bf663778b2a56c614818069043354d4b6d5f156'],
  'number_of_files_with_merge_conflict': 1,
  'total_number_of_merge_conflicts': 2,
  'files_in_merge_conflict': ['models/index_model.py']
}

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': 'torchaudio/transforms/_transforms.py',
  'branch': 'main',
  'times_seen_consecutively': 3,
  'purity': 0.69,
  'newest_commit': '7ac3e2e237e443baf91dfbf9893fca114c1c6001',
  'oldest_commit': '3742cebb7dc0f8adf24f4ee1cea368195c448f78'
}

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, programming languages and merge conflict resolution samples.

Dataset Skew

The below statistics show that our dataset does not exhibit an extreme skew towards some repositories and is relatively well balanced with respect to source repositories.

Distribution Statistics

  • Total number of repositories analyzed: 816
  • Average (mean) samples per repository: 21.4
  • Standard deviation (std): 48.8
  • Minimum (min): 1
  • 25th percentile (25%): 2
  • Median (50%): 6
  • 75th percentile (75%): 18
  • Maximum (max): 644

Top-10 Repositories by Sample Count

Repository Percentage of Total Samples
zulip/zulip 3.69%
trinodb/trino 2.47%
wandb/wandb 2.46%
facebook/litho 2.16%
oss-review-toolkit/ort 1.96%
apache/tomcat 1.94%
nvidia/nemo 1.76%
h2oai/h2ogpt 1.32%
conan-io/conan 1.30%
huggingface/transformers 1.05%

Distribution of Programming Languages

We do however note a severe skew towards Python and Java with only 3.8% of samples being Kotlin.

Programming Language Count Percentage
python 10985 62.82%
java 5881 33.67%
kotlin 603 3.45%

Difficulty Distribution for "merge" Scenarios

Difficulty Proportion
easy 0.516466
hard 0.299672
medium 0.183861

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
39