Unnamed: 0
int64 4
17.1k
| 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 | project_activity
stringclasses 2
values | difficulty
stringclasses 3
values |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
12,677 | hyperledger_besu_merge_0005 | hyperledger/besu | main | Apache License 2.0 | 1,392 | 2019-09-04T09:11:20 | besu;blockchain;ethereum;java;p2p | java | {'merge_commit_hash': '26ce584c145cb44dded067bb1d4d68002bfbb754', 'parents': ['5415ecd7d3eb0d0e248b866b8cbd12bd48551c73', '50d88313cf8cfe7faab4ad817981cf6619b22b66'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 8, 'files_in_merge_conflict': ['evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java', 'evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCreateOperation.java', 'evm/src/main/java/org/hyperledger/besu/evm/operation/Create2Operation.java', 'evm/src/main/java/org/hyperledger/besu/evm/operation/CreateOperation.java', 'evm/src/test/java/org/hyperledger/besu/evm/operation/AbstractCreateOperationTest.java']} | merge | large | month | hard |
9,143 | spongepowered_spongeapi_merge_0003 | 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': '13310e1064cfe9608712f56abe0797db967b5521', 'parents': ['0bdd41026156ca2c4030b9fc97fb42ab22a3e7fa', '0c5950c7f9c0fb736872b036b12f1d5f3367c986'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/org/spongepowered/api/datapack/DataPackType.java', 'src/main/java/org/spongepowered/api/tag/TagTemplate.java']} | merge | medium | month | hard |
101 | vert_x3_vertx_web_merge_0000 | vert-x3/vertx-web | master | Apache License 2.0 | 1,089 | 2014-11-14T08:15:20 | client;reactive;server;sockjs;vertx;web | java | {'merge_commit_hash': '34194ec68a59c1925df1cdee56f574c3acc27bb1', 'parents': ['6488f765dc0ccd760ed237bffd6703bd2a4d1414', '9714e409b248baecc3998580d89524447b33a21d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['vertx-web/src/main/java/io/vertx/ext/web/handler/impl/APIKeyHandlerImpl.java']} | merge | large | month | medium |
151 | thombergs_code_examples_merge_0000 | thombergs/code-examples | master | MIT License | 2,597 | 2017-07-30T02:12:24 | unavailable | java | {'merge_commit_hash': '041442297e97ed59efa61239cb667adf7c2dddfd', 'parents': ['2223be80c9803cd572bd0654ac96fc18496c6d56', '1f37a81b90003c35beed6216432f689936917cb1'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['aws/kinesis/src/main/java/io/pratik/flink/ErrorCounter.java']} | merge | large | month | medium |
8,612 | eirslett_frontend_maven_plugin_merge_0001 | eirslett/frontend-maven-plugin | master | Apache License 2.0 | 4,175 | 2013-08-30T02:44:38 | not available | java | {'merge_commit_hash': '2eb4da12ec903b95adc7fa41c1ea302a823be1ab', 'parents': ['da638518b9e4ad1847eda689ea962f41d0da2a81', '07e220ec744f762a32d9247f76118347f9c234b6'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/com/github/eirslett/maven/plugins/frontend/NpmMojo.java']} | merge | medium | month | medium |
6,468 | gchq_gaffer_merge_0007 | 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': '55a2c0e14bae089bfcdc8e82dc3206df4ea818f1', 'parents': ['73b517e937ac628b6f65d6ba4fbfad5c11444534', 'af75bf5dcc513cb420df85c32e44bc1dc00660c6'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 8, 'files_in_merge_conflict': ['integration-test/src/test/java/uk/gov/gchq/gaffer/integration/AbstractStoreITs.java', 'store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/integration/MapStoreITs.java']} | merge | large | month | hard |
1,387 | linkedin_ambry_merge_0001 | linkedin/ambry | master | Apache License 2.0 | 1,719 | 2013-10-25T08:04:54 | not available | java | {'merge_commit_hash': '51bd3864c6a82928ef2495c37fb5f8c94f9a0c5e', 'parents': ['e2a431cd429ba3ec3335a5bbc07c95279d0f33ee', '2357ddd789a5806c28975968feceb786e50aeea8'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 8, 'files_in_merge_conflict': ['ambry-replication/src/main/java/com/github/ambry/replication/ReplicaThread.java', 'ambry-replication/src/main/java/com/github/ambry/replication/continuous/DataNodeTracker.java', 'ambry-replication/src/main/java/com/github/ambry/replication/continuous/GroupTracker.java']} | merge | large | month | hard |
1,556 | wiremock_wiremock_merge_0002 | 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': 'a910c000cc7ae4de6f3990fd610f9abc38cca091', 'parents': ['a0c9d5d053ea89bf289d8d83cf643d35f112dafa', '7838f14e389bc0a29c9ba0bf28fd272e9f1f0d93'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHandlerDispatchingServlet.java']} | merge | medium | month | easy |
1,769 | jbellis_jvector_merge_0002 | jbellis/jvector | main | Apache License 2.0 | 1,276 | 2023-08-25T01:45:20 | ann;java;knn;machine-learning;search-engine;similarity-search;vector-search | java | {'merge_commit_hash': '7fcdc5319da048a137711b3a54042317b881331b', 'parents': ['0779199870dea3120cfba47d66d061b7b14dbc4a', 'd31f1c86b69997fd2f8436ddb0ee07ba48c7ad52'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['jvector-base/src/main/java/io/github/jbellis/jvector/util/PoolingSupport.java']} | merge | medium | month | medium |
14,918 | morphiaorg_morphia_merge_0001 | morphiaorg/morphia | master | Apache License 2.0 | 1,626 | 2013-04-25T05:41:02 | java;kotlin;mongodb;odm | java | {'merge_commit_hash': '258b4d92953f07b25e2ff269f047aab0f9e8b33e', 'parents': ['0385ea26b57bb7ffedba30cc9224444ab698c175', 'c94816b9e34215a1508be9a9bf7fde3fd1df4a51'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['legacy-tests/src/test/java/dev/morphia/TestDatastore.java']} | merge | medium | month | easy |
14,502 | questdb_questdb_merge_0010 | questdb/questdb | master | Apache License 2.0 | 13,535 | 2014-04-28T11:29:15 | analytics;big-data;cpp;database;financial-analysis;grafana;hacktoberfest;iot;java;low-latency;postgres;postgresql;questdb;simd;sql;time-series;time-series-database;tsdb | java | {'merge_commit_hash': '170424b99a69d75ecb8c29e01d0385cdbe029938', 'parents': ['b03e44285a8c199b5f9ed097f84307abd22822dc', '2899a028b444ffd11a6795f0f36f2e4635f1828b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['core/src/test/java/io/questdb/test/griffin/ParallelGroupByFuzzTest.java']} | merge | large | month | easy |
15,896 | haraldk_twelvemonkeys_merge_0001 | haraldk/twelvemonkeys | master | BSD 3-Clause New or Revised License | 1,809 | 2009-09-03T05:44:28 | bmp;icc-profiles;icns;iff;imageio;java;java-imageio;jpeg;pbm;pcx;pgm;pict;plug-ins;ppm;psd;svg;tga;tiff;twelvemonkeys-imageio;webp | java | {'merge_commit_hash': '21ff12219a95adb234aaa78dc98c0e73cc434a89', 'parents': ['eed4242aa4adad939166671410e717fa9078b1c4', 'ff0389055b12604315dbb32b789aa253af23e63b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java']} | merge | large | month | medium |
1,586 | firebase_firebase_android_sdk_merge_0001 | 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': '8b93b8eac8a29a7c85d644e43d9c7e32d8542eb8', 'parents': ['d7e27bd4d2eaff73f1b0338667400733fe33020a', '5cc1bf5c86c452a0f17032269eb765806322161f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestoreSettings.java']} | merge | large | month | medium |
10,609 | apache_atlas_merge_0000 | apache/atlas | master | Apache License 2.0 | 1,766 | 2017-07-22T07:00:08 | atlas | java | {'merge_commit_hash': 'd75aeb5d7998edfe82dffd81610728cd04d02731', 'parents': ['720957e8508a6ba50db67657a28e3f7ebfa82b03', '3e1637a48acfde2fb6100ebe7d4d8394852e91c6'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['repository/src/main/java/org/apache/atlas/listener/TypesChangeListener.java', 'repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java', 'repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java']} | merge | large | month | hard |
303 | fasterxml_jackson_core_merge_0004 | fasterxml/jackson-core | 2.18 | Apache License 2.0 | 2,234 | 2011-12-23T02:00:51 | hacktoberfest;jackson;json | java | {'merge_commit_hash': 'c67612e1312309b160ff42d092da3af22580a01b', 'parents': ['9fa856c1a545018ce40a86b918b514c3329edd86', '3aa1ef0497a032cb3267e5fe45ffe09891fe012b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/com/fasterxml/jackson/core/util/TextBuffer.java']} | merge | large | month | medium |
144 | apache_rocketmq_merge_0001 | 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': 'be46fb989fa78ce58f18becf8a3d1ca3c5fe90f8', 'parents': ['b82596689e61b9443927a004e38437460a578d78', '05fee0d773d971cc56aafbbb95955f44fb963bed'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java', 'store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java']} | merge | large | month | hard |
1,391 | linkedin_ambry_merge_0005 | linkedin/ambry | master | Apache License 2.0 | 1,719 | 2013-10-25T08:04:54 | not available | java | {'merge_commit_hash': '1fa58d7aecceb135b55008e64f038e13a114ccd6', 'parents': ['1503fbe11e5f4c5e9b650af3f976a83f3c70199e', '031be9a1d85d97b206ff45296d7cb3a39ae5db41'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['ambry-replication/src/main/java/com/github/ambry/replication/BackupCheckerThread.java']} | merge | large | month | easy |
73 | alluxio_alluxio_merge_0000 | 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': 'c736475cf0c5e1caff66d7f392b80a228901198a', 'parents': ['ad2dab62d6be566ca755b1b5e015d89217a6301e', '1d6cb25d21fa550d44d12000a64827d8349ac6d6'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['core/common/src/main/java/alluxio/conf/PropertyKey.java']} | merge | large | month | medium |
14,894 | openrewrite_rewrite_merge_0005 | 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 | month | hard |
193 | bootique_bootique_merge_0001 | bootique/bootique | master | Apache License 2.0 | 1,412 | 2015-12-10T02:45:15 | bootique;dependency-injection;java;runnable-jar | java | {'merge_commit_hash': '87aeec2487a43d6bb7ffc1389e375dd975ba3d3f', 'parents': ['39937c0afca646a8b0f7952344d23011238d1edf', '125670859b0afa45c153dd706f2b34cbedf87080'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['bootique/src/main/java/io/bootique/BootiqueUtils.java', 'bootique/src/test/java/io/bootique/BootiqueUtilsTest.java']} | merge | medium | month | hard |
60 | opensearch_project_opensearch_merge_0000 | 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': '9b44aed179e671212267a390c04e26a782d6f3c7', 'parents': ['5ffc131ac845ad0fab53b2667ed3f238b0df0a97', 'b0e1f6abe58f545b87d759afe5794b6eac0be3c1'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['server/src/main/java/org/opensearch/node/Node.java']} | merge | huge | month | easy |
12,438 | codecentric_spring_boot_admin_merge_0003 | 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': '13da9ff60fbe36358a74c1d0cec6502304f55f7f', 'parents': ['6c3f41820d246f2b3968cf76f58a770c715a034e', 'f0e0d6f09585d30effd55ac0e3c93e721aa451c6'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/services/endpoints/ProbeEndpointsStrategyTest.java', 'spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/services/endpoints/QueryIndexEndpointStrategyTest.java']} | merge | large | month | hard |
13,399 | apache_cassandra_merge_0068 | apache/cassandra | trunk | Apache License 2.0 | 8,538 | 2009-05-21T02:10:09 | cassandra;database;java | java | {'merge_commit_hash': '5431a88d7bd77ee5c2b7938dd9b014bf623979cd', 'parents': ['4f14c85471a6ee443429dd3da06d9cc8f56feeca', '012b987e267bdfb39b44c8afd4f4ccbb48a1ddf4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java']} | merge | huge | month | medium |
6,702 | apache_cloudstack_merge_0085 | 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': 'a44f28bb312c6070331d852053ebe20aa7753216', 'parents': ['3fd5680d9a1a6591e9aa209abc44e3b40a3d9e54', 'c24c1a5c000cad0c5298a6fa7e752a8c83124f9a'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java', 'server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java']} | merge | huge | month | hard |
7,810 | firebase_firebase_android_sdk_merge_0020 | 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': '7c6985ca11ed75efc4690d60b3950d9b2ff04c75', 'parents': ['b1b8f2fe22d1910fd68f32ee53319e5c8bfeffe2', 'a727f6c0c52ae464b122871e54bf09cf04d72934'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java', 'firebase-installations/src/test/java/com/google/firebase/installations/FirebaseInstallationsTest.java']} | merge | large | month | hard |
4,846 | googlecloudplatform_java_docs_samples_merge_0001 | googlecloudplatform/java-docs-samples | main | Apache License 2.0 | 1,717 | 2015-03-25T10:48:38 | appengine;auth;automl;cdn;java;kotlin;samples;translate;video;vision | java | {'merge_commit_hash': '0ebca92650da6a74689d9f49b31e8bbc1e0fc8bb', 'parents': ['6f875d6501088ee0e0328a2eaff8e16f08a2e7f5', '81d0cbc6c5e6d01393124c575f7a8eb31e70a1ef'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['compute/cloud-client/src/test/java/compute/reservation/ReservationIT.java']} | merge | large | month | medium |
6,794 | gitlab4j_gitlab4j_api_merge_0002 | 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': '0dfbca1a33e2dbea07e0d36ff62362acab64ebf7', 'parents': ['184fd89235c8c2208e5a77248eaac80669e0559d', 'b563bb19c8103cd7387d50a52e76b51521318343'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java']} | merge | medium | month | easy |
13,506 | questdb_questdb_merge_0003 | questdb/questdb | master | Apache License 2.0 | 13,535 | 2014-04-28T11:29:15 | analytics;big-data;cpp;database;financial-analysis;grafana;hacktoberfest;iot;java;low-latency;postgres;postgresql;questdb;simd;sql;time-series;time-series-database;tsdb | java | {'merge_commit_hash': '599440f112c36b2aa7dbb7d42f941d2c3d7c68fb', 'parents': ['400ae8a56ddbb70c1c83d57d9be3a72be6201809', '5e43637af4f7992c2dbceef88c6d1a84b227ee58'], 'number_of_files_with_merge_conflict': 6, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['core/src/main/java/io/questdb/cairo/AbstractTableNameRegistry.java', 'core/src/main/java/io/questdb/cairo/CairoEngine.java', 'core/src/main/java/io/questdb/cairo/wal/seq/TableTransactionLog.java', 'core/src/main/java/io/questdb/cairo/wal/seq/TableTransactionLogFile.java', 'core/src/main/java/io/questdb/cairo/wal/seq/TableTransactionLogV1.java', 'core/src/main/java/io/questdb/cairo/wal/seq/TableTransactionLogV2.java']} | merge | large | month | hard |
12,676 | hyperledger_besu_merge_0004 | hyperledger/besu | main | Apache License 2.0 | 1,392 | 2019-09-04T09:11:20 | besu;blockchain;ethereum;java;p2p | java | {'merge_commit_hash': '7a2c4129eb66f584a4efa65a24d253c007f1b90f', 'parents': ['e48e1dc6c69b40a9167d8d279f42a5d1cc2eaf10', '690a2ea81e2bf62508ff16675cd7dbaeb006fa83'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java']} | merge | large | month | easy |
8,129 | google_data_transfer_project_merge_0002 | 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': '4eb8ec05dce5a2f5a213884821f44164e9a8b68a', 'parents': ['688e2fc68683b969f50be61aae0e5d19511b1647', '3e33a07f6fd7f4bba00b72ccf883c0c270374e47'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['extensions/data-transfer/portability-data-transfer-smugmug/src/main/java/org/datatransferproject/transfer/smugmug/photos/SmugMugInterface.java']} | merge | medium | month | easy |
1,892 | spring_cloud_spring_cloud_openfeign_merge_0021 | spring-cloud/spring-cloud-openfeign | main | Apache License 2.0 | 1,149 | 2018-02-05T09:26:12 | feign;openfeign;spring;spring-cloud | java | {'merge_commit_hash': 'f5461821a19d08c453353e959c5052d0e249b860', 'parents': ['1b41e39740068f35e03421cbcf1cbcca1dc8fee4', '14914b4c971011197ceffcd5ed0dc14f82981866'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java']} | merge | medium | month | easy |
5,472 | apache_iotdb_merge_0018 | 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': 'fc02a0a59515e52db9bef20244917446b87f6bcf', 'parents': ['7309dd7b48bef3e1cdfc0e2390227f934ebab479', '7640df9a2b91e06b13931429994e72cf0caccc52'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/IoTDBThriftAsyncConnector.java', 'iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/historical/PipeHistoricalDataRegionTsFileExtractor.java']} | merge | large | month | hard |
5,703 | clickhouse_clickhouse_java_merge_0002 | 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': '2e24b4763665c93a9252bb862966a85ad4e8e653', 'parents': ['ff38ee08e4c253135744b42627c5a8d2549c677a', '1baf186fecf837161fcc0c31608bc329823b6a14'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java']} | merge | large | month | easy |
8,527 | fabricmc_fabric_merge_0000 | fabricmc/fabric | 1.20.6 | Apache License 2.0 | 2,112 | 2018-11-04T09:02:05 | fabric;hacktoberfest;java;minecraft | java | {'merge_commit_hash': 'bf575bf0131fed526ddf2a2203e5a83673cd64dd', 'parents': ['002bec9c0567fef2b47f11c1a43df88be43a0623', '3c53fe33fed22218918452c7620dec676c22ffd9'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinIdRegistry.java', 'fabric-registry-sync-v0/src/testmod/java/net/fabricmc/fabric/test/registry/sync/RegistrySyncTest.java']} | merge | medium | month | hard |
158 | activiti_activiti_merge_0000 | activiti/activiti | develop | Apache License 2.0 | 9,924 | 2012-09-13T11:34:43 | activiti;bpm;bpmn;business-process;cloud;hxps;java;microservices;product-activiti;spring | java | {'merge_commit_hash': '750be935ae61214963fcd6855ce5035d3f75ad99', 'parents': ['bd3a22c51bfd2650fe97e4876eb8c5ad5dca824b', 'df595843c7138491d3bfa3e7cf32084a474e74ba'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['activiti-core/activiti-engine/src/test/java/org/activiti/engine/test/cfg/multitenant/MultiTenantProcessEngineTest.java']} | merge | large | month | medium |
14,065 | movingblocks_terasology_merge_0005 | movingblocks/terasology | develop | Apache License 2.0 | 3,629 | 2011-03-04T03:49:19 | game;game-development;game-engine;game-engine-3d;gamedev;hacktoberfest;java;sandbox;voxel | java | {'merge_commit_hash': '300df88cd5b772fc07d8e1352feccdea5696f5bf', 'parents': ['183c2248438181bce33c31a61963b5e3b6ffc76a', 'efe4a53be54ec68211f4a8c732f0f21d0cb46d4b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/LocalChunkProvider.java']} | merge | large | month | medium |
98 | micrometer_metrics_micrometer_merge_0001 | 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': 'c6cfbc41cd25881b52fac24cff78dcfd90ffa5ca', 'parents': ['13049aadae534f23da72c117a888f55bc1572c3f', '07fa8000d3aeaacb66bbd19929d6c196b2607c9b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/DatadogStatsdLineBuilder.java']} | merge | medium | month | easy |
9,698 | alibaba_nacos_merge_0013 | alibaba/nacos | develop | Apache License 2.0 | 29,171 | 2018-06-15T06:49:27 | alibaba;config;configuration-management;distributed-configuration;dns;dubbo;istio;kubernetes;microservices;nacos;service-discovery;service-mesh;spring-cloud | java | {'merge_commit_hash': '4424af2a773e167c2d2ed928116cfe91417340c8', 'parents': ['4ed7aa350ba371386240128fce739c7b9029dbfd', '5caa57351a20d578ac2d4d0c9c8ce8c9599c8ee4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['client/src/main/java/com/alibaba/nacos/client/naming/cache/DiskCache.java']} | merge | large | month | easy |
11,560 | kagkarlsson_db_scheduler_merge_0004 | kagkarlsson/db-scheduler | master | Apache License 2.0 | 1,132 | 2015-08-12T06:01:34 | db-scheduler;hacktoberfest;java;jdbc;job-scheduler;scheduler;spring-boot;task-scheduler | java | {'merge_commit_hash': 'fc69a7b4ecac9c93367a47dd53e79af553d06f53', 'parents': ['8d368bb8cd5ecc9e92f5394163bbaf1a8e2f80b0', '5371c658ad76e6a2cb4a2838770acc783601ac92'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['db-scheduler/src/test/java/com/github/kagkarlsson/scheduler/JdbcTaskRepositoryTest.java']} | merge | medium | month | medium |
2,462 | bitcoinj_bitcoinj_merge_0000 | bitcoinj/bitcoinj | master | Apache License 2.0 | 4,932 | 2013-11-19T04:33:23 | bech32;bip141;bip143;bip144;bip173;bip32;bip37;bip70;bitcoin;bitcoinj;blockchain;java;library;segwit;taproot | java | {'merge_commit_hash': '03db1a9636895fc268340e7b175287cd6adeea90', 'parents': ['6459f15202ad7a8d247d630267953bf528730223', '7cc23e3e6b01a69a980702a538a23909fff9839a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/com/google/bitcoin/core/Transaction.java']} | merge | medium | month | easy |
6,033 | apache_sedona_merge_0000 | apache/sedona | master | Apache License 2.0 | 1,785 | 2015-04-24T06:01:29 | cluster-computing;geospatial;java;python;scala;spatial-analysis;spatial-query;spatial-sql | java | {'merge_commit_hash': '952d1d61a9271b08749d00b9d17ea4eb74cead8f', 'parents': ['61955fb38d1c082da93f00f6c5a58b708d157c3a', 'e8188b1a3af9726fca9a1eb425d2713e594e8394'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['core/src/main/java/org/datasyslab/geospark/formatMapper/shapefileParser/ShapefileRDD.java', 'core/src/main/java/org/datasyslab/geospark/formatMapper/shapefileParser/ShapefileRDD_BACKUP_6231.java', 'core/src/main/java/org/datasyslab/geospark/formatMapper/shapefileParser/ShapefileRDD_BACKUP_6316.java', 'core/src/main/java/org/datasyslab/geospark/formatMapper/shapefileParser/parseUtils/shp/ShpFileParser.java']} | merge | large | month | hard |
4,845 | googlecloudplatform_java_docs_samples_merge_0000 | googlecloudplatform/java-docs-samples | main | Apache License 2.0 | 1,717 | 2015-03-25T10:48:38 | appengine;auth;automl;cdn;java;kotlin;samples;translate;video;vision | java | {'merge_commit_hash': 'd21c31a31c76a1505fcd4dc104f0812f200ee599', 'parents': ['31f088cd42b0fc20663a7f19683c5c3e0457c629', 'ba36764cb88c00221d06e32907057401b93c0350'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['compute/cloud-client/src/test/java/compute/disks/HyperdisksIT.java', 'compute/cloud-client/src/test/java/compute/reservation/ReservationIT.java']} | merge | large | month | hard |
1,768 | jbellis_jvector_merge_0001 | jbellis/jvector | main | Apache License 2.0 | 1,276 | 2023-08-25T01:45:20 | ann;java;knn;machine-learning;search-engine;similarity-search;vector-search | java | {'merge_commit_hash': 'eed405756f2d8cde89f00bb675b125e8f9918f01', 'parents': ['55a1c82b6ccd8c9b059811f6e0ff7aad2478acab', '3fef4cd6f43afb3f0c801636a16bd1399660d774'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['jvector-base/src/main/java/com/github/jbellis/jvector/example/Deep100MWriter.java']} | merge | medium | month | easy |
5,895 | googlemaps_google_maps_services_java_merge_0000 | googlemaps/google-maps-services-java | main | Apache License 2.0 | 1,685 | 2014-08-15T04:35:21 | client-library;java | java | {'merge_commit_hash': 'c44a3affa1a6a955ac35d3b17a274f10ba3d341b', 'parents': ['a036f6c30f9df90d4f46b86e9ec8ce199109f9a5', '62a8b507ea547bc6092732fb456c2e5655e252e4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/com/google/maps/PlaceDetailsRequest.java']} | merge | medium | month | medium |
127 | pac4j_pac4j_merge_0000 | pac4j/pac4j | master | Apache License 2.0 | 2,381 | 2012-01-28T05:04:12 | authentication;authorization;cas;dropwizard;j2e;java;jax-rs;jwt;ldap;oauth;openid-connect;play-framework;ratpack;saml;security;shiro;sparkjava;spring-mvc;spring-security;vertx | java | {'merge_commit_hash': '0d34968bf9d87e1dba6c8fb3ee7722cb401f7c36', 'parents': ['81711b170e7bffc01b3c93c5b3cd1df89defe0ab', 'b0460ad963c0574c9b7bcd974e9d5f5c6469689a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/org/scribe/up/provider/impl/FacebookProvider.java']} | merge | medium | month | easy |
336 | micrometer_metrics_micrometer_merge_0010 | 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': '2d46fa9147267e5d53473755940c815ec548b076', 'parents': ['d1ec39568a03dae149c6f0ebedc1dba1abdfc7f7', '6ae5efd7c31e5dd9627eedc3ab93b809bfd90917'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['micrometer-core/src/test/java/io/micrometer/core/instrument/MeterRegistryTest.java']} | merge | medium | month | easy |
6,795 | gitlab4j_gitlab4j_api_merge_0003 | 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': '13533a4198fd1cb6d689c6a977128382d1e4d174', 'parents': ['8ee5beca878855ec7c7cd33eb689480d8d74e88b', '5c891fe7d0ef0c327766f4e3d578c0f06ce03473'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/java/org/gitlab4j/api/GroupApi.java', 'src/main/java/org/gitlab4j/api/ProjectApi.java']} | merge | medium | month | hard |
304 | fasterxml_jackson_core_merge_0005 | fasterxml/jackson-core | 2.18 | Apache License 2.0 | 2,234 | 2011-12-23T02:00:51 | hacktoberfest;jackson;json | java | {'merge_commit_hash': 'dd1d5e947eb393bb32bd2ec1db8fa39de4f42dbc', 'parents': ['ce44a7d45194d0aa6b6e959623a65faa3a873b4b', '8823774c7a63a0294baf07be360888e54a889e26'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/test/java/tools/jackson/core/jsonptr/JsonPointer1328Test.java', 'src/test/java/tools/jackson/failing/JsonPointer1328Test.java']} | merge | large | month | hard |
7,176 | netflix_hollow_merge_0001 | netflix/hollow | master | Apache License 2.0 | 1,161 | 2016-12-02T06:56:43 | not available | java | {'merge_commit_hash': 'b266eb8e0daf1be536b617a667ef514aa94ffef2', 'parents': ['aea000c2943d967403f6523d5e7de98516689a6c', '71458842d620e97427d9b17972c134b8918bbd78'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['hollow/src/test/java/com/netflix/hollow/api/producer/HollowIncrementalProducerTest.java']} | merge | medium | month | easy |
115 | apache_zeppelin_merge_0000 | apache/zeppelin | master | Apache License 2.0 | 6,274 | 2015-03-25T07:00:06 | big-data;database;flink;java;javascript;nosql;scala;spark;zeppelin | java | {'merge_commit_hash': '4fac1c03e216af7e5931ad4e2ede40a081a78f6c', 'parents': ['d5236b8e1ac99a83e45583b97de0bb671cd4a76b', '69c57ea9c285d31d8b7b56ceeb88a225b8fcc833'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterServer.java']} | merge | large | month | easy |
240 | JetBrains_intellij_platform_gradle_plugin_merge_0000 | JetBrains/intellij-platform-gradle-plugin | main | Apache License 2.0 | 1,390 | 2015-04-14T01:18:35 | gradle;gradle-intellij-plugin;intellij;intellij-ides;intellij-platform;intellij-plugin;intellij-sdk;jetbrains-plugin;plugin-verifier | kotlin | {'merge_commit_hash': '635425b6bdecd0ccc3c2526f7aa9ac6beeb96dae', 'parents': ['6b9ef051279cae7582e3a1b936a6bd8bd94f9516', 'd2e8f98e151b2f992f1befd8b9ae36f86f469a14'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['src/main/kotlin/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformDependenciesExtension.kt', 'src/main/kotlin/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformExtension.kt', 'src/main/kotlin/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformRepositoriesExtension.kt', 'src/main/kotlin/org/jetbrains/intellij/platform/gradle/extensions/extensions.kt', 'src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/project/IntelliJPlatformBasePlugin.kt']} | merge | medium | week | hard |
241 | JetBrains_intellij_platform_gradle_plugin_merge_0001 | JetBrains/intellij-platform-gradle-plugin | main | Apache License 2.0 | 1,390 | 2015-04-14T01:18:35 | gradle;gradle-intellij-plugin;intellij;intellij-ides;intellij-platform;intellij-plugin;intellij-sdk;jetbrains-plugin;plugin-verifier | kotlin | {'merge_commit_hash': '3040dede0cef42f9a72b0f1cae2f3e0dea5258f0', 'parents': ['4f3e6e0f2c0bb33bfb8d543772fe04ab06aa150d', 'cc226be03d26f2afd4318b5e53e769cf5da4adb4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/test/kotlin/org/jetbrains/intellij/tasks/RunPluginVerifierTaskSpec.kt']} | merge | medium | week | medium |
242 | airbnb_showkase_merge_0000 | airbnb/showkase | master | Apache License 2.0 | 2,065 | 2020-04-22T01:25:24 | android;android-library;annotation-processor;design-systems;jetpack-android;jetpack-compose;reusable-components;ui-components | kotlin | {'merge_commit_hash': '46602050394d592e358e468504a1a1c2ae01fbfe', 'parents': ['cb63efae2d6c52c4e0bbce3e233bd1642dab8810', '0106b8bfa60b6a0bac32840a00d1fa67c6045f38'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['showkase-annotation/src/main/java/com/airbnb/android/showkase/annotation/ShowkaseComposable.kt']} | merge | medium | week | easy |
4,215 | airbnb_showkase_merge_0003 | airbnb/showkase | master | Apache License 2.0 | 2,065 | 2020-04-22T01:25:24 | android;android-library;annotation-processor;design-systems;jetpack-android;jetpack-compose;reusable-components;ui-components | kotlin | {'merge_commit_hash': '5cabcc879463d971624455941a0d0fd89cad5544', 'parents': ['f232888687946e867421e7418bec4c369af6f149', '901ad3ddb1096b560cf4f9e4c9e1b095c184f850'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['showkase-processor-testing/src/test/java/com/airbnb/showkase_processor_testing/ShowkaseProcessorTest.kt', 'showkase-processor/src/main/java/com/airbnb/showkase/processor/ShowkaseProcessor.kt', 'showkase-processor/src/main/java/com/airbnb/showkase/processor/models/ShowkaseMetadata.kt']} | merge | medium | week | hard |
7,168 | android_compose_samples_merge_0004 | android/compose-samples | main | Apache License 2.0 | 19,021 | 2019-09-27T09:51:19 | android;jetpack-compose | kotlin | {'merge_commit_hash': 'a27c1cadb9575e067a2794667329bb06cae77e16', 'parents': ['260cb850735bf488c9f6612c3b07c1bef0b90b4e', 'b7897e75b4ac039bd407b6f438cbe30800cc5771'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt']} | merge | medium | week | easy |
245 | android_compose_samples_merge_0001 | android/compose-samples | main | Apache License 2.0 | 19,021 | 2019-09-27T09:51:19 | android;jetpack-compose | kotlin | {'merge_commit_hash': '03f4e81a4e57e78cacea43579d402469eeb1014a', 'parents': ['4241b911b6ae663700b11a34cca0e992bf32f7b9', '7eaaae68eb118bbbac3a55e269c3d1ffdff61294'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['JetLagged/app/src/main/java/com/example/jetlagged/JetLaggedScreen.kt', 'JetLagged/app/src/main/java/com/example/jetlagged/MainActivity.kt']} | merge | medium | week | hard |
246 | android_compose_samples_merge_0002 | android/compose-samples | main | Apache License 2.0 | 19,021 | 2019-09-27T09:51:19 | android;jetpack-compose | kotlin | {'merge_commit_hash': '1f86d26144f7d5b9587521e6093e2ad479bd83fd', 'parents': ['bf5dfa4d794471079a730298e3d88694ff866bdf', 'eedb9d48a772622a582d86d0399629fd9dca53df'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['JetLagged/app/src/main/java/com/example/jetlagged/JetLaggedDrawer.kt']} | merge | medium | week | medium |
248 | android_nowinandroid_merge_0002 | android/nowinandroid | main | Apache License 2.0 | 15,451 | 2022-04-19T08:40:24 | android;jetpack-compose;kotlin | kotlin | {'merge_commit_hash': '89a1294c633d72f8e9c8b3296274b44b9af966b8', 'parents': ['ed90a382aa9777fcddd1aabb3895a2e8277c4d39', '6c0d6ad82e5146ba6dcb355e2cc4cc004e30653c'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt']} | merge | medium | month | easy |
10,108 | android_nowinandroid_merge_0007 | android/nowinandroid | main | Apache License 2.0 | 15,451 | 2022-04-19T08:40:24 | android;jetpack-compose;kotlin | kotlin | {'merge_commit_hash': 'b5d342468e529d0bce752c50f13b9fcd3fdad594', 'parents': ['0e6f16e0a8b650a42a361c361e13dca972234487', '28ffbb0b7ecf083634770a79c358f0322fb31a2f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt']} | merge | medium | month | easy |
249 | android_nowinandroid_merge_0003 | android/nowinandroid | main | Apache License 2.0 | 15,451 | 2022-04-19T08:40:24 | android;jetpack-compose;kotlin | kotlin | {'merge_commit_hash': '050db2cb727313a89388ff77d9405f5aaea361e9', 'parents': ['b49767a88cce244d7ccd4a8c218de92787b52549', 'feafb5fbed6fd381503ea1f3d88477558200a1ed'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt', 'feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt']} | merge | medium | month | hard |
10,109 | android_nowinandroid_merge_0008 | android/nowinandroid | main | Apache License 2.0 | 15,451 | 2022-04-19T08:40:24 | android;jetpack-compose;kotlin | kotlin | {'merge_commit_hash': 'b887f0c03ce1c6eef14404454de35c6da3eceb81', 'parents': ['21926339da173ceb9d4ad5f309993d823c965fe3', '22904e28d019703600d6ac2d411b01640b67eb73'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt']} | merge | medium | month | medium |
191 | aniyomiorg_aniyomi_merge_0000 | aniyomiorg/aniyomi | master | Apache License 2.0 | 4,331 | 2021-04-17T01:35:37 | android;anime;manga | kotlin | {'merge_commit_hash': '9baf6adce541ea5126f841b9043cb767585d0cd1', 'parents': ['495b68bf84beab456ae07b23b851be0cd897c798', '631c2068225cca0694c89e233baa382e731a3622'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['app/src/main/java/eu/kanade/presentation/more/settings/screen/AdvancedPlayerSettingsScreen.kt', 'app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerPreferences.kt']} | merge | large | week | hard |
192 | apollographql_apollo_kotlin_merge_0000 | apollographql/apollo-kotlin | main | MIT License | 3,678 | 2016-09-28T02:03:30 | android;apollographql;graphql;graphql-client;kotlin;kotlin-multiplatform;multiplatform | kotlin | {'merge_commit_hash': 'f91f3efc8c5f98cc36ca4b2ed362213ce76d1aa3', 'parents': ['5e83d35ec8c70f8d63ee6077d47e84054403b074', '72847fcc9271fe4d73014159ee3ef9b1cf126b2c'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['tests/normalization-tests/src/test/kotlin/com/example/NormalizationTest.kt']} | merge | large | week | easy |
193 | burhanrashid52_photoeditor_merge_0000 | burhanrashid52/photoeditor | master | MIT License | 4,027 | 2018-01-23T11:44:10 | android;canvas;emoji;facebook;filters;image-processing;instagram;paint;photo-editor;stickers;stories;text-editor | kotlin | {'merge_commit_hash': '1e01b0becf7950f14ed96e1c2cc68723b552fa47', 'parents': ['61bbcf4922c35f61d5c77b7b0c607ea9f66177fb', 'ec1dec0bc4e44a5015d37a484c1cea54140b5fda'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['photoeditor/src/main/java/ja/burhanrashid52/photoeditor/DrawingView.kt']} | merge | small | month | easy |
194 | burhanrashid52_photoeditor_merge_0001 | burhanrashid52/photoeditor | master | MIT License | 4,027 | 2018-01-23T11:44:10 | android;canvas;emoji;facebook;filters;image-processing;instagram;paint;photo-editor;stickers;stories;text-editor | kotlin | {'merge_commit_hash': '20c91e2934eac434ea1df42ac5283547ea274912', 'parents': ['1e01b0becf7950f14ed96e1c2cc68723b552fa47', 'b78110354e7407e157a21953024df258bd3a0646'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['photoeditor/src/main/java/ja/burhanrashid52/photoeditor/DrawingView.kt', 'photoeditor/src/main/java/ja/burhanrashid52/photoeditor/shape/ShapeBuilder.kt']} | merge | small | month | hard |
195 | cashapp_redwood_merge_0000 | cashapp/redwood | trunk | Apache License 2.0 | 1,493 | 2020-10-19T02:20:09 | unavailable | kotlin | {'merge_commit_hash': 'af61b57fe7e5e18963d3d021657d3327c5991124', 'parents': ['dd92ca98159b972f396f2392b0860f08edeb17fb', 'f9b3b3e9afed2f1e4db7fb7afee96a1f2395567e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['samples/emoji-search/presenter/src/commonMain/kotlin/com/example/redwood/emojisearch/presenter/EmojiSearch.kt']} | merge | medium | week | easy |
1,913 | cashapp_redwood_merge_0003 | cashapp/redwood | trunk | Apache License 2.0 | 1,493 | 2020-10-19T02:20:09 | not available | kotlin | {'merge_commit_hash': '07db52040c87438547aa25b89496dbbc05a1b11c', 'parents': ['f9d29124b269ad1805f57ba575efec1d5b93038f', 'ff050de45bc4ad814588bd309aa4152d50975fb4'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['redwood-layout-uiview/src/commonMain/kotlin/app/cash/redwood/layout/uiview/UIViewFlexContainer.kt', 'redwood-layout-view/src/main/kotlin/app/cash/redwood/layout/view/ViewFlexContainer.kt', 'redwood-widget/src/androidMain/kotlin/app/cash/redwood/widget/ViewGroupChildren.kt', 'samples/emoji-search/presenter/src/commonMain/kotlin/com/example/redwood/emojisearch/presenter/EmojiSearch.kt']} | merge | medium | week | hard |
197 | celzero_rethink_app_merge_0000 | celzero/rethink-app | main | Apache License 2.0 | 2,503 | 2020-06-08T01:41:18 | android;android-app;android-application;android-firewall;anti-censorship;anti-surveillance;censorship-circumvention;censorship-resistance;dns;dns-over-https;dnscrypt;firewall;internet-freedom;open-source;privacy-enhancing-technologies;wireguard | kotlin | {'merge_commit_hash': 'fef5b45f0511fd5bb8ee5d0aad0ee74f4e98f4df', 'parents': ['108d3478618640d13a957c02d34d2262cb5e6b14', 'b3bc40f3d123e5996ad38a7576c0098bead9bc9c'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['app/src/full/java/com/celzero/bravedns/service/WireguardManager.kt']} | merge | medium | week | easy |
199 | coil_kt_coil_merge_0001 | coil-kt/coil | main | Apache License 2.0 | 10,382 | 2019-08-10T09:28:21 | android;androidx;compose;compose-multiplatform;coroutines;image-loader;images;kotlin;kotlin-coroutines;okio | kotlin | {'merge_commit_hash': '9c056b4b4fce026234fcce1830d1e6124d3a848e', 'parents': ['9840ec3f311765f7a0d14198f019410aa915d13f', '29bebc4ae6a48a420ae2bac77c4ff5fa5d5cf354'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['buildSrc/src/main/kotlin/Library.kt']} | merge | medium | week | easy |
5,043 | coil_kt_coil_merge_0004 | coil-kt/coil | main | Apache License 2.0 | 10,382 | 2019-08-10T09:28:21 | android;androidx;compose;compose-multiplatform;coroutines;image-loader;images;kotlin;kotlin-coroutines;okio | kotlin | {'merge_commit_hash': '727bee5e3135fd083e63d4141c896efe4b703ca5', 'parents': ['472b6e124bd5a5a80f9e033d6402c270e9ce01ac', 'ab7cc8e7ee5fcb773bf67c6f0fa0588fe5612541'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['coil-base/src/main/java/coil/ComponentRegistry.kt']} | merge | medium | week | easy |
380 | coil_kt_coil_merge_0003 | coil-kt/coil | main | Apache License 2.0 | 10,382 | 2019-08-10T09:28:21 | android;androidx;compose;compose-multiplatform;coroutines;image-loader;images;kotlin;kotlin-coroutines;okio | kotlin | {'merge_commit_hash': '093cac66229c3e4a0806d672fd3d8edf90607371', 'parents': ['4610a6ae0e66518ffae6a17580bc80cbd378f27d', '3ae2750fe55f030c08d03c3b9074957a06978290'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['coil-base/src/androidTest/java/coil/transition/CrossfadeTransitionTest.kt', 'coil-base/src/main/java/coil/transition/CrossfadeTransition.kt']} | merge | medium | week | hard |
381 | corda_corda_merge_0001 | corda/corda | release/os/4.12 | Apache License 2.0 | 3,970 | 2016-10-06T08:46:29 | corda;distributed-ledger;dlt;kotlin | kotlin | {'merge_commit_hash': 'cf1e69190d1808d7d4876139acb8b937ce732140', 'parents': ['d17f536bc7dc638f95e852d953865d2b8417fb1b', 'c460b132fd0430b7a729d06d7dbaf56171359e88'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['node/src/test/kotlin/net/corda/node/services/statemachine/RetryFlowMockTest.kt']} | merge | large | month | easy |
15,931 | corda_corda_merge_0006 | corda/corda | release/os/4.12 | Apache License 2.0 | 3,970 | 2016-10-06T08:46:29 | corda;distributed-ledger;dlt;kotlin | kotlin | {'merge_commit_hash': 'fe416879cdca9c72c7d0a72f16356feeaa20f971', 'parents': ['9698c53e6e2faeae3dbb24f89d818d93b079d185', '53fe0e6cf822cdc83d7c0c1250d94a55480c9472'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt']} | merge | large | month | easy |
486 | corda_corda_merge_0004 | corda/corda | release/os/4.12 | Apache License 2.0 | 3,970 | 2016-10-06T08:46:29 | corda;distributed-ledger;dlt;kotlin | kotlin | {'merge_commit_hash': '301dc7469b661b2fad16aea10a1cec9687bc2fda', 'parents': ['dc4d888a305954d710fa75e8d0b54c84a9ef83ff', '844b33ee94d44983410f2de4f0eabaf40956cac8'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['core/src/main/kotlin/net/corda/core/contracts/AttachmentConstraint.kt', 'core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt', 'node/src/integration-test/kotlin/net/corda/node/ContractWithRotatedKeyTest.kt']} | merge | large | month | hard |
384 | duckduckgo_android_merge_0001 | duckduckgo/android | develop | Apache License 2.0 | 3,591 | 2017-01-13T05:11:25 | android;duckduckgo;duckduckgo-android;hacktoberfest;translations | kotlin | {'merge_commit_hash': '15bf1444d2f32f5dc6caf81d792172b9d97da618', 'parents': ['a3d86f525275e9a43dbf0c581ab29778f513bad2', '9f2134c63cb999aa2abce8cc3987b238df627f8b'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt', 'app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt']} | merge | large | week | hard |
3,548 | duckduckgo_android_merge_0004 | duckduckgo/android | develop | Apache License 2.0 | 3,591 | 2017-01-13T05:11:25 | android;duckduckgo;duckduckgo-android;hacktoberfest;translations | kotlin | {'merge_commit_hash': 'a6b1b70f9dd61e1339cdd73902edc3aab72bc422', 'parents': ['693fe53e64444e552c716b3e6a0f95ab4282caa2', 'ecff7e216c3608c06fc4ff347dd0f450ed870acf'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['app/src/main/java/com/duckduckgo/app/browser/pageloadpixel/firstpaint/PagePaintedHandler.kt', 'privacy-config/privacy-config-api/src/main/java/com/duckduckgo/privacy/config/api/PrivacyFeatureName.kt']} | merge | large | week | hard |
217 | element_hq_element_android_merge_0001 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': 'e033736d92f99122a8e0cde39897a6c0394a1933', 'parents': ['501f89dddb93ad7cb3f2c76671bc505e462fdcfa', '3a387c5e32ac22cda445082a421251fe3b006b61'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['vector/src/main/java/im/vector/app/core/di/VectorModule.kt']} | merge | large | week | easy |
290 | element_hq_element_android_merge_0004 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '7449d15d2f6119704f8ab7d234432113d635c39d', 'parents': ['fbb6f117d048757f3b1f83565cde8bd7f7ec0970', '21e46c5840d559751d60ae51dcb4f0a0b7c725d4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt']} | merge | large | week | easy |
364 | element_hq_element_android_merge_0017 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '923bc00dcd7c2128ef4e30c941898cbd336cdd08', 'parents': ['9aeba10b7ec1545b69e320d64e85342b95412a75', '7338982030da6a39415d4883f34d682fae64c1fc'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt']} | merge | large | week | easy |
294 | element_hq_element_android_merge_0008 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': 'dc43479699eaf0d4bbcda79ad7c72570a5e9f6b9', 'parents': ['ed4606b113914a788a2ae7eaf4420f04e71f64d5', '95b3afd1488b046b3d36e99a8ed91d11a710778a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt']} | merge | large | week | easy |
292 | element_hq_element_android_merge_0006 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '7badf7783f77c2261006459756841b073d3c7c4c', 'parents': ['32fcdad91696884f566ed7838415bba2d391fa4a', '31a0a049b140ab007277d095f26f222258382eb3'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt']} | merge | large | week | easy |
6,436 | element_hq_element_android_merge_0024 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '0e61f6f8f8693b47a2a478f7445fdff8975976c4', 'parents': ['751aff2d12d86e0d8cf8144b4b6cc89848fabb23', '438b456f8e6f5b69db83ddcd3d4614a0213f336c'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['vector/src/main/java/im/vector/app/features/home/room/list/home/RoomSummaryRoomListDiffCallback.kt']} | merge | large | week | easy |
7,460 | element_hq_element_android_merge_0031 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '054c61d076a64c5afe7df4f03e7552833d8be9be', 'parents': ['1210e8c712b4b440ea822a6c01f1f774da8b202b', '767be72eec816f2eb1fc0a43f710dd14d5b13735'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt']} | merge | large | week | easy |
6,440 | element_hq_element_android_merge_0028 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': 'f98b595d85e32f50124d2cbe680e8138b7835e8f', 'parents': ['27bc43c24c5d3ba56c09e7a05f1e3c2e3e5d9288', 'b18a873cf79687946d314075b3fc3382c5384c69'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo025.kt']} | merge | large | week | easy |
389 | element_hq_element_android_merge_0021 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '6ee0b62272ffb5e45d26be1e3d9dd95a64eca7ff', 'parents': ['4af883f5d2780337a20a1c207011d1191255499a', 'f863bdea376c7e58cbace1cc69bf404a15beef0d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['vector/src/main/java/im/vector/app/features/location/LocationSharingService.kt']} | merge | large | week | easy |
6,441 | element_hq_element_android_merge_0029 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '636474b748874092636ca1faa3c1b0e5d8f56447', 'parents': ['5e23947419e7a90d448c43474e3aaaa8c6de4674', '256929b78f4af62ed3d9b26c8b05dfb1aa073661'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt', 'vector/src/main/java/im/vector/app/features/command/Command.kt', 'vector/src/main/java/im/vector/app/features/command/CommandParser.kt', 'vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt']} | merge | large | week | hard |
296 | element_hq_element_android_merge_0010 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': 'e6e05317e1fd57959b2411af5dcac9945d0919a2', 'parents': ['d5432cd0e7b657e957af865972307128b7221d2e', '9cf9e10e5cfdeb78282da5d01ad6a7d011ff0acc'], 'number_of_files_with_merge_conflict': 6, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt', 'matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt', 'matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt', 'matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt', 'vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt', 'vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt']} | merge | large | week | hard |
6,437 | element_hq_element_android_merge_0025 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '14cee226c5e48aafba4631fd22c5b349ca57c1d5', 'parents': ['d3ef5cc230366d890d40f2dedf9e557644f9d42e', 'de18f37849fa599eb174ea9f5394867b86378670'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt', 'vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt', 'vector/src/main/java/im/vector/app/features/settings/notifications/DisableNotificationsForCurrentSessionUseCase.kt', 'vector/src/main/java/im/vector/app/features/settings/notifications/EnableNotificationsForCurrentSessionUseCase.kt']} | merge | large | week | hard |
295 | element_hq_element_android_merge_0009 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '4cf97d48c9729fb98f0030a2f8c39924e84d7d0d', 'parents': ['fe274515323b7512c41145c82cd7a3410fa43880', 'abea68557bb52bedeb327cc469bae7ba9c720847'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt', 'matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt', 'vector/src/main/java/im/vector/app/features/login/LoginActivity.kt', 'vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt']} | merge | large | week | hard |
215 | element_hq_element_android_merge_0000 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '990a266d8315bd4c6b12d515e9633cd38f8a37ba', 'parents': ['56e15cf054deb8ab577427470f2e688a77184fa7', '2717ad475a1889c8bce57de8c1d82f1bd219e2fe'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt']} | merge | large | week | medium |
271 | element_hq_element_android_merge_0003 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '35be56a44a5aa6cdba831f7d354c1edbc25b10d8', 'parents': ['f76490130cab871b7dade83b7a1a03aaeb0ae48c', '59cf20be35000c695a9e5aa39717ae8072205fba'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt']} | merge | large | week | medium |
7,462 | element_hq_element_android_merge_0033 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '202c0c58ab6b70744b0efa4dd35834fbdb28ba86', 'parents': ['6f997e8a0f29cd97bdccc5c891048f1ad0213baf', '744b03a806535ed581a9f69edeab5fcf2562474d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt']} | merge | large | week | medium |
272 | evant_kotlin_inject_merge_0000 | evant/kotlin-inject | main | Apache License 2.0 | 1,114 | 2019-07-02T12:30:10 | dependency-injection;kotlin | kotlin | {'merge_commit_hash': '377ed7d3daf12125869b2787104beac4bbc7926b', 'parents': ['f16d45a8c3f8c990af6ec5d613485a117de52056', '0a955672954f26afabd4a321447f217040c87d7f'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['integration-tests/common/src/test/kotlin/me/tatarka/inject/test/InnerClassComponentTest.kt', 'kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultResolver.kt']} | merge | small | month | hard |
47 | fasterxml_jackson_module_kotlin_merge_0004 | fasterxml/jackson-module-kotlin | 2.18 | Apache License 2.0 | 1,107 | 2014-08-27T08:20:03 | deserialization;hacktoberfest;jackson;json;kotlin;serialization | kotlin | {'merge_commit_hash': '4e456db5acf08459d94be1100c36811f1cfe608d', 'parents': ['e4b2f1d8cb8a40dee6bd8ab0b6de167ced63f6f1', 'cab221ce6655c679726ffd8788e7c8532fc7cdac'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt']} | merge | medium | month | easy |
274 | fasterxml_jackson_module_kotlin_merge_0001 | fasterxml/jackson-module-kotlin | 2.18 | Apache License 2.0 | 1,107 | 2014-08-27T08:20:03 | deserialization;hacktoberfest;jackson;json;kotlin;serialization | kotlin | {'merge_commit_hash': 'ea567b89dee410befcafa3a9a05e8db2b7e6cc8b', 'parents': ['c33e84ac2956a97805e0bfb1ef667adaa48eb6a4', 'f37785d1c8273163ec0d6d1be2162848e5ff19aa'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/test/kotlin/tools/jackson/module/kotlin/test/github/Github50.kt', 'src/test/kotlin/tools/jackson/module/kotlin/test/github/Github56.kt', 'src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github50.kt']} | merge | medium | month | hard |
275 | fasterxml_jackson_module_kotlin_merge_0002 | fasterxml/jackson-module-kotlin | 2.18 | Apache License 2.0 | 1,107 | 2014-08-27T08:20:03 | deserialization;hacktoberfest;jackson;json;kotlin;serialization | kotlin | {'merge_commit_hash': 'dda9c82dd614797ac7a981b580c7544a4f15055a', 'parents': ['d0f9ab6d956b202654ff64e5a877a659a4b43b1a', 'e2e25016d9213001327db194ecab8f11e1495c8a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinNamesAnnotationIntrospector.kt']} | merge | medium | month | medium |
489 | foso_ktorfit_merge_0002 | foso/ktorfit | master | Apache License 2.0 | 1,407 | 2019-08-21T07:58:38 | android;annotation-processor;hacktoberfest;http-client;kotlin;kotlin-compiler-plugin;kotlin-mpp;kotlin-multiplatform;kotlin-multiplatform-mobile;kotlin-native;kotlinjs;ksp;ktor | kotlin | {'merge_commit_hash': '45aea1096a65bc97c4e7be902f24144d3d93a11a', 'parents': ['d8599270058a6216c72ae38f1bf0d5d25bb2e010', '71d3364d8cdf8b03610090770621521721c5ab8f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/model/ClassData.kt']} | merge | medium | week | easy |
277 | foso_ktorfit_merge_0001 | foso/ktorfit | master | Apache License 2.0 | 1,407 | 2019-08-21T07:58:38 | android;annotation-processor;hacktoberfest;http-client;kotlin;kotlin-compiler-plugin;kotlin-mpp;kotlin-multiplatform;kotlin-multiplatform-mobile;kotlin-native;kotlinjs;ksp;ktor | kotlin | {'merge_commit_hash': '78f38c19d6e91729d204c986d82bcde76cedb7af', 'parents': ['01c2ac0cd6d72d1c22cc02ea70e1f56297beb3eb', '4f58b70c3e2142ca7546618414b089255693c179'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['sandbox/src/jvmMain/kotlin/de/jensklingenberg/ktorfit/demo/JvMMain.kt', 'sandbox/src/jvmMain/kotlin/de/jensklingenberg/ktorfit/demo/QueryTestApi.kt']} | merge | medium | week | hard |
4,539 | getsentry_sentry_java_merge_0001 | getsentry/sentry-java | main | MIT License | 1,105 | 2012-02-06T03:46:55 | android;apollo-client;crash-reporting;feign-client;hacktoberfest;java;kotlin;log4j2;logback;okhttp;sentry;servlet;spring;spring-boot;tag-production;timber | kotlin | {'merge_commit_hash': 'ab4c32b4fc3570cf556ba31b72549096aef343e2', 'parents': ['2dea7902687c7183f081e63238c420906f408c54', 'ff346e6abe5f459beb03c3b3186acb92b178f047'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['sentry-core/src/test/java/io/sentry/core/EnvelopeSenderTest.kt', 'sentry-core/src/test/java/io/sentry/core/SentryClientTest.kt']} | merge | large | month | hard |
279 | jetbrains_compose_multiplatform_merge_0000 | jetbrains/compose-multiplatform | master | Apache License 2.0 | 14,995 | 2020-09-07T10:40:49 | android;awt;compose;declarative-ui;desktop;gui;ios;javascript;kotlin;multiplatform;reactive;swing;ui;wasm;web;webassembly | kotlin | {'merge_commit_hash': '670902de2b37bd637e07405e927caf7a8367a56d', 'parents': ['9592e0924fdf6ae5c9fbbb97786b1ddb823ebd72', 'dc3b743f2c9068926c3548f3184c74c548f46162'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/Color.kt']} | merge | medium | week | easy |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.