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 |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
330 | jetbrains_compose_multiplatform_merge_0002 | 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': '9f89051b4bf311288a66a3c62d5c82fb7a39149a', 'parents': ['fa9b2a51f882d9a9f18c6f901f96569666c8770b', '5164e0669be9094425dfa998ecd82f18795d028e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['web/core/src/jsTest/kotlin/css/CSSTextTests.kt']} | merge | medium | week | easy |
8,452 | jetbrains_compose_multiplatform_merge_0009 | 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': '8427c25f1e36450aee566e82373323beceef42e5', 'parents': ['39d947307082bbc01f83c4ca25b27100a037534f', '19777bfda6a1f0da0f33baf7fb08c39809f8f831'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['examples/imageviewer/shared/src/commonMain/kotlin/example/imageviewer/view/GalleryScreen.kt']} | merge | medium | week | easy |
332 | jetbrains_compose_multiplatform_merge_0004 | 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': 'f08ab3fad75fd3c65b24dbd643f0a67f9e24adb7', 'parents': ['bed0e34945ab52de11458175e2cc3d25e4820d3f', '2bd08c323a177058980b6c7ae00725c5721c743e'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/text.kt', 'web/core/src/jsTest/kotlin/css/CSSTextTests.kt']} | merge | medium | week | hard |
6,636 | jetbrains_compose_multiplatform_merge_0008 | 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': 'a66ee345b8a215a21b02b8ec322bc2ddf375b436', 'parents': ['2f10010204f2bd04b916cabaab1d81a11a3402e3', 'ab90e5bd1d8d1bffbb0ee017c791724d704d3896'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/configurePackComposeUiKitApplicationForXCodeTask.kt', 'gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/registerConnectedDeviceTasks.kt', 'gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/registerSimulatorTasks.kt']} | merge | medium | week | hard |
334 | jetbrains_exposed_merge_0001 | jetbrains/exposed | main | Apache License 2.0 | 7,963 | 2013-07-30T12:55:27 | dao;kotlin;orm;sql | kotlin | {'merge_commit_hash': '975e98b30f456bd885475bb7a490ffd7007c079c', 'parents': ['f85375c919b197758273b1d7ea2256de6dff7cd4', '526b6fd760954b1773b75c67782893aeae4ba8c3'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DMLTests.kt']} | merge | medium | week | easy |
335 | jetbrains_exposed_merge_0002 | jetbrains/exposed | main | Apache License 2.0 | 7,963 | 2013-07-30T12:55:27 | dao;kotlin;orm;sql | kotlin | {'merge_commit_hash': 'a93cb8443cada0dab8f6d389c600c35a3d2de8ec', 'parents': ['2fa27271821358357b104985160b1a3afe1b7be9', 'faf6cbd50fb54896f5c7413ef47958f79d97af10'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['exposed/src/main/kotlin/org/jetbrains/exposed/sql/Database.kt', 'exposed/src/main/kotlin/org/jetbrains/exposed/sql/transactions/ThreadLocalTransactionManager.kt', 'exposed/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/EntityTests.kt', 'exposed/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/ThreadLocalManagerTest.kt', 'spring-transaction/src/main/kotlin/org/jetbrains/exposed/spring/SpringTransactionManager.kt']} | merge | medium | week | hard |
9,293 | jetbrains_exposed_merge_0007 | jetbrains/exposed | main | Apache License 2.0 | 7,963 | 2013-07-30T12:55:27 | dao;kotlin;orm;sql | kotlin | {'merge_commit_hash': '7ca1c6bf39217ce8125035e70109de4e97864116', 'parents': ['ef65029edc798519a9e029af0045935aedc19f4b', '64db145df5971f65882ad33d25207aef43cf277e'], 'number_of_files_with_merge_conflict': 6, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['exposed/src/main/kotlin/org/jetbrains/exposed/sql/Database.kt', 'exposed/src/main/kotlin/org/jetbrains/exposed/sql/transactions/ThreadLocalTransactionManager.kt', 'exposed/src/main/kotlin/org/jetbrains/exposed/sql/transactions/TransactionApi.kt', 'exposed/src/main/kotlin/org/jetbrains/exposed/sql/transactions/experimental/Suspended.kt', 'exposed/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/EntityTests.kt', 'spring-transaction/src/main/kotlin/org/jetbrains/exposed/spring/SpringTransactionManager.kt']} | merge | medium | week | hard |
337 | jetbrains_ideavim_merge_0002 | jetbrains/ideavim | master | MIT License | 8,849 | 2011-03-09T03:22:27 | ideavim;intellij;intellij-platform;intellij-plugin;jb-official;jetbrains;kotlin;vim | kotlin | {'merge_commit_hash': '1c21968259d349eff420923be60357589f21ce3a', 'parents': ['1d8ac4fc02d2427d5630862d73f83a4cd4e3008a', '0bac6bf8b6765419c76affe22c19afa8693c9839'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/com/maddyhome/idea/vim/option/OptionsManager.kt']} | merge | large | week | easy |
4,468 | jetbrains_ideavim_merge_0006 | jetbrains/ideavim | master | MIT License | 8,849 | 2011-03-09T03:22:27 | ideavim;intellij;intellij-platform;intellij-plugin;jb-official;jetbrains;kotlin;vim | kotlin | {'merge_commit_hash': 'ce734906d4c71f65a2bcd47e5e023d4d5f697d4e', 'parents': ['fbdcbdc6265f77ee8f10d7100d7b921a1ac75297', '3b26572731844e9ab3c64ef2f729ed4ee8779d74'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/com/maddyhome/idea/vim/extension/matchit/Matchit.kt']} | merge | large | week | easy |
339 | jetbrains_ideavim_merge_0004 | jetbrains/ideavim | master | MIT License | 8,849 | 2011-03-09T03:22:27 | ideavim;intellij;intellij-platform;intellij-plugin;jb-official;jetbrains;kotlin;vim | kotlin | {'merge_commit_hash': 'ee743674c299af0924c1d722f5bbd491fd31becb', 'parents': ['3fae2fdae5cc5748927bc5b7f998af01fa6472e0', '362f8a3c998e6061b66b07bdf865190089b59aaf'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/com/maddyhome/idea/vim/helper/MessageHelper.kt', 'src/com/maddyhome/idea/vim/option/OptionsManager.kt']} | merge | large | week | hard |
320 | jetbrains_ideavim_merge_0001 | jetbrains/ideavim | master | MIT License | 8,849 | 2011-03-09T03:22:27 | ideavim;intellij;intellij-platform;intellij-plugin;jb-official;jetbrains;kotlin;vim | kotlin | {'merge_commit_hash': '74b0e3bded0cf022ffc27484a177e597455b56e7', 'parents': ['ae21727c1293c0b7cb5cf65aa7a372ff6a106540', 'edc0a14ef1bf3677f78260b933b7f99953970f4f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/com/maddyhome/idea/vim/listener/VimListenerManager.kt']} | merge | large | week | medium |
321 | kasperskylab_kaspresso_merge_0000 | kasperskylab/kaspresso | master | Apache License 2.0 | 1,753 | 2019-09-12T02:25:08 | android;architecture;best-practices;dsl;espresso;flakiness;hacktoberfest;interceptors;kakao;kaspresso;uiautomator;uiautomator2 | kotlin | {'merge_commit_hash': '2e5cb8ef2da6b1cf9f75a4fe0ecf17df29c6bb62', 'parents': ['5f205c23653b445ae2365125b08df4c98292aa49', '70cf8dbd68d255979e3ad8b1c1cc7f6915e0d1cc'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['kaspresso/src/main/kotlin/com/kaspersky/kaspresso/testcases/api/testcase/DocLocScreenshotTestCase.kt']} | merge | medium | month | medium |
2,148 | kickstarter_android_oss_merge_0001 | kickstarter/android-oss | master | Apache License 2.0 | 5,741 | 2016-12-12T05:15:41 | android;android-development;frp;functional-programming;functional-reactive-programming;kotlin-android;rxjava | kotlin | {'merge_commit_hash': '6898cd600b48294dc9f5b89ad870f4c6f55fe73d', 'parents': ['ef1f90f4e287e7accab8a31f2eae0931225e1797', 'd0fbc87c8e0b3dcc19235706f44c20a43deaaf44'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['app/src/main/java/com/kickstarter/features/pledgedprojectsoverview/ui/PledgedProjectsOverviewActivity.kt', 'app/src/main/java/com/kickstarter/features/pledgedprojectsoverview/viewmodel/PledgedProjectsOverviewViewModel.kt']} | merge | large | week | hard |
323 | kosi_libs_kodein_merge_0000 | kosi-libs/kodein | master | MIT License | 3,151 | 2015-04-16T09:19:43 | android;compose;compose-desktop;injection;kodein;kodein-di;kodein-framework;kotlin;kotlin-dependency-injection;kotlin-multiplatform;ktor;tornadofx | kotlin | {'merge_commit_hash': 'edb77425c8dd309611b2148bd7e1de9cce52b7d9', 'parents': ['e6d9cbbe9816eeef54f3232d6f1ad67a552452f2', '35f555a8e5fc36ac9c226d1559f180a14f5a1334'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['kodein-di/src/commonMain/kotlin/org/kodein/di/DIBuilder.kt', 'kodein-di/src/commonMain/kotlin/org/kodein/di/bindings/DIBinding.kt', 'kodein-di/src/commonMain/kotlin/org/kodein/di/bindings/scopes.kt', 'kodein-di/src/commonMain/kotlin/org/kodein/di/bindings/standardBindings.kt']} | merge | medium | month | hard |
324 | kotest_kotest_merge_0000 | kotest/kotest | master | Apache License 2.0 | 4,315 | 2015-11-29T04:32:15 | assertions;hacktoberfest;kotlin;matchers;property-testing;test;testing;testing-tools | kotlin | {'merge_commit_hash': '91b6dbd8b176de37d04aafd13f30f70e61a25aca', 'parents': ['94c04475c06a245ceb091b0e1e8c89cb2b2aa64b', '9c936fadcde9efbf3e31b17bb7c5316f044eece4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['kotest-framework/kotest-framework-engine/src/jvmTest/kotlin/com/sksamuel/kotest/engine/test/TestCaseSourceRefTest.kt']} | merge | large | week | easy |
14,951 | kotlin_dokka_merge_0007 | kotlin/dokka | master | Apache License 2.0 | 3,290 | 2014-07-12T09:15:22 | api-reference;documentation;dokka;kotlin | kotlin | {'merge_commit_hash': '4b22ebab09ce3b934443d063df6b905e5347c390', 'parents': ['0fa9b69b6afe762e5aee7b7cf801a38ebe74b2c9', 'b566f8852e94f9a17be86bf845aeff6c36bd8378'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['core/src/main/kotlin/Model/PackageDocs.kt']} | merge | large | month | easy |
10 | kotlin_dokka_merge_0005 | kotlin/dokka | master | Apache License 2.0 | 3,290 | 2014-07-12T09:15:22 | api-reference;documentation;dokka;kotlin | kotlin | {'merge_commit_hash': '8b5329a48aa84de32c76e39f62fd3edbd36051ec', 'parents': ['24d590574bb19a8063b1afefd0243353c34644fa', 'dfe9b83c57f21d8f9f2bda74a02bc042bd329271'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt', 'runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt']} | merge | large | month | hard |
14,952 | kotlin_dokka_merge_0008 | kotlin/dokka | master | Apache License 2.0 | 3,290 | 2014-07-12T09:15:22 | api-reference;documentation;dokka;kotlin | kotlin | {'merge_commit_hash': 'ad8808274418e60f4347df39c6d7944892b25ea8', 'parents': ['d05d3906bb062c1b45fd52182d6b1dc9d0feec2c', '67c2c9e9d2c881a4752f4e25c1b9da6cf8bb7941'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaPlugin.kt', 'dokka-runners/dokka-gradle-plugin/src/main/kotlin/internal/gradleUtils.kt']} | merge | large | month | hard |
328 | kotlin_dokka_merge_0004 | kotlin/dokka | master | Apache License 2.0 | 3,290 | 2014-07-12T09:15:22 | api-reference;documentation;dokka;kotlin | kotlin | {'merge_commit_hash': 'aa771999b3c6fcb121482414f7f32c5f94d366ad', 'parents': ['9805daba82a223d43bbc2aa2548d76ae01f23266', 'b9f4b81092b492c1519f9d16fb7511b78d20d17d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['runners/gradle-plugin/src/main/kotlin/main.kt']} | merge | large | month | medium |
329 | kotlin_kotlinx_io_merge_0000 | kotlin/kotlinx-io | master | Apache License 2.0 | 1,094 | 2017-10-04T07:31:15 | io;kotlin;kotlinx | kotlin | {'merge_commit_hash': 'bc6328068a8c3c65ac14dbd01538ff3694747a1e', 'parents': ['d48c492dd56eda25048a0c79ba8e955eeb0205c0', '7f101706ae372eb58721a48d3bf2c986d8c653c2'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['core/jvm/src/SegmentPool.kt']} | merge | medium | month | medium |
5 | kotlin_kotlinx_coroutines_merge_0005 | kotlin/kotlinx.coroutines | master | Apache License 2.0 | 12,771 | 2016-06-22T01:49:21 | async;coroutines;kotlin | kotlin | {'merge_commit_hash': '04d9265a222ef1225977b03692a9cf3f7139f8e5', 'parents': ['a48692bdec393bc3dbf18a361e7edb6c83fddadb', '9c9b2706af07af00aa18560ed4e0889ebecb0086'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['kotlinx-coroutines-core/common/src/internal/SegmentQueueSynchronizer.kt']} | merge | medium | week | easy |
251 | kotlin_kotlinx_coroutines_merge_0002 | kotlin/kotlinx.coroutines | master | Apache License 2.0 | 12,771 | 2016-06-22T01:49:21 | async;coroutines;kotlin | kotlin | {'merge_commit_hash': '6d9f40f83e8e8d35c0a924ad81937c3907a7f2d8', 'parents': ['f6430f480f68f70f19238c008f641ab510740fd8', '76146bbe83cc4a9caf5afe3d158515b5c2f493dd'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['common/kotlinx-coroutines-core-common/src/main/kotlin/kotlinx/coroutines/experimental/AbstractContinuation.kt', 'common/kotlinx-coroutines-core-common/src/main/kotlin/kotlinx/coroutines/experimental/CompletedExceptionally.kt', 'common/kotlinx-coroutines-core-common/src/main/kotlin/kotlinx/coroutines/experimental/Job.kt', 'common/kotlinx-coroutines-core-common/src/test/kotlin/kotlinx/coroutines/experimental/channels/ProduceTest.kt']} | merge | medium | week | hard |
252 | kotlin_kotlinx_serialization_merge_0000 | kotlin/kotlinx.serialization | master | Apache License 2.0 | 5,144 | 2017-07-20T11:25:23 | cbor;json;kotlin;protobuf;serialization | kotlin | {'merge_commit_hash': 'adf350b55dacc876a8aa3574d4ed77063d1084e0', 'parents': ['b0189e7b25f3571fba9e81868eb172e8454fedd3', '4af0f30b11ef2cdddc6d01f444783702f493d0a2'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['formats/json/jsMain/src/kotlinx/serialization/json/internal/FormatLanguageJs.kt']} | merge | large | week | easy |
253 | kotlin_kotlinx_serialization_merge_0001 | kotlin/kotlinx.serialization | master | Apache License 2.0 | 5,144 | 2017-07-20T11:25:23 | cbor;json;kotlin;protobuf;serialization | kotlin | {'merge_commit_hash': '34307d7af1bec423f19d1a7ae391c5ee640ee14d', 'parents': ['6eb4042f9c780c7a3ca0b1d40e159b7d0a94d112', '1038c669a0de64d7df008209df3a76a2f43f1230'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['runtime/common/src/main/kotlin/kotlinx/serialization/cbor/Cbor.kt', 'runtime/common/src/test/kotlin/kotlinx/serialization/features/SkipDefaults.kt', 'runtime/jvm/src/test/kotlin/kotlinx/serialization/features/GenericCustomSerializerTest.kt']} | merge | large | week | hard |
254 | ktorio_ktor_merge_0001 | ktorio/ktor | main | Apache License 2.0 | 12,361 | 2015-08-03T04:49:36 | async;asynchronous;kotlin;web;web-framework | kotlin | {'merge_commit_hash': 'cfe97550c66149e92944fb92757e6cacf6d4f2c3', 'parents': ['4a078732034291f4564413b64551a2ba16bd6a06', 'c3406de4266f8a4c86f129b9d95df6b89fdd599d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['ktor-utils/common/src/io/ktor/util/pipeline/StackTraceRecover.kt']} | merge | large | week | easy |
3,742 | mockk_mockk_merge_0002 | mockk/mockk | master | Apache License 2.0 | 5,304 | 2017-10-17T10:31:23 | argument-matchers;chain-calls;hacktoberfest;kotlin;matcher;mock;mocking-framework;tdd;testing;verification | kotlin | {'merge_commit_hash': 'e149d16498e80b6d4ae073fbc38ab6d489baa4b4', 'parents': ['1443a17d2c8f289babce850f4fca40c1838d3091', '1087750b0efac3015e7876710a1f97b1cf43c7cd'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['common/src/main/kotlin/io/mockk/MockK.kt']} | merge | medium | month | easy |
256 | mockk_mockk_merge_0001 | mockk/mockk | master | Apache License 2.0 | 5,304 | 2017-10-17T10:31:23 | argument-matchers;chain-calls;hacktoberfest;kotlin;matcher;mock;mocking-framework;tdd;testing;verification | kotlin | {'merge_commit_hash': '5e52005dfaff5282ad1bacc006fa56da12396d2e', 'parents': ['00a4d7ad76068310bfb80f3dacdf40c63f372e63', 'f57a3ebd68321cef62cda9672383ebeb535d9c68'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['dsl/js/src/main/kotlin/io/mockk/InternalPlatformDsl.kt', 'mockk/jvm/src/main/kotlin/io/mockk/impl/InternalPlatform.kt']} | merge | medium | month | hard |
257 | nekomangaorg_Neko_merge_0000 | nekomangaorg/Neko | main | Apache License 2.0 | 2,121 | 2019-04-22T09:06:52 | android;j2k;komga;kotlin;manga;manga-downloader;manga-reader;mangadex;mangadex-downloader;mangadownloader;mangareader;mihon;neko;tachiyomi;tachiyomi-app | kotlin | {'merge_commit_hash': '73a03ca11b5af80e8d574db99fd3af3c168e111f', 'parents': ['b52bcc2a352dbafd1c649ce57ebac723e41d3ff2', '9d6dbf5763187bd9e624802abeefcb675cbb51ed'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt', 'app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt', 'app/src/main/java/org/nekomanga/presentation/components/ChapterRow.kt', 'app/src/main/java/org/nekomanga/presentation/components/DownloadButton.kt', 'app/src/main/java/org/nekomanga/presentation/screens/BrowseScreen.kt']} | merge | medium | month | hard |
258 | nekomangaorg_Neko_merge_0001 | nekomangaorg/Neko | main | Apache License 2.0 | 2,121 | 2019-04-22T09:06:52 | android;j2k;komga;kotlin;manga;manga-downloader;manga-reader;mangadex;mangadex-downloader;mangadownloader;mangareader;mihon;neko;tachiyomi;tachiyomi-app | kotlin | {'merge_commit_hash': '01fdbde8976b07b646cea11cb884792f273e7912', 'parents': ['73a03ca11b5af80e8d574db99fd3af3c168e111f', 'dd963603708abcc8c1640b7c77c6d1642e92c06b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt']} | merge | medium | month | medium |
7,577 | netflix_dgs_framework_merge_0002 | netflix/dgs-framework | master | Apache License 2.0 | 3,009 | 2020-11-30T11:54:32 | dgs;graphql;graphql-java;java;spring-boot | kotlin | {'merge_commit_hash': '7eb802448fdeb87295157315e1ccd91734a1ec3a', 'parents': ['5c1b83a4544cf4b809b9505cf2394573c4e6d3de', '8fedf3580f3c69e5308ce781aeb967c1a4c55359'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['graphql-dgs/src/main/kotlin/com/netflix/graphql/dgs/internal/DgsDataLoaderProvider.kt']} | merge | medium | week | easy |
230 | netflix_dgs_framework_merge_0000 | netflix/dgs-framework | master | Apache License 2.0 | 3,009 | 2020-11-30T11:54:32 | dgs;graphql;graphql-java;java;spring-boot | kotlin | {'merge_commit_hash': 'cd2e4bd483690db2c58ab642016145b0bfb1d4b4', 'parents': ['4bf940a4fafe499630c8f45eb342e367731e1151', '096b358e008c9274ab5a005965e9f6776d5001ae'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['graphql-dgs-subscriptions-sse/src/main/kotlin/com/netflix/graphql/dgs/subscriptions/sse/DgsSSESubscriptionHandler.kt', 'graphql-dgs-subscriptions-sse/src/test/kotlin/com/netflix/graphql/dgs/subscriptions/sse/DgsSSESubscriptionHandlerTest.kt']} | merge | medium | week | hard |
231 | pedroSG94_RootEncoder_merge_0000 | pedroSG94/RootEncoder | master | Apache License 2.0 | 2,416 | 2017-01-21T07:32:49 | aac;amf;android;av1;encoder;filters;g711;h264;h265;java;kotlin;mpeg2-ts;opus;rtmp;rtp;rtsp;srt;stream;streaming;udp | kotlin | {'merge_commit_hash': '6b4c857f41f4a04fc15db33bc0fa4e9b44ae347e', 'parents': ['b6f09d1a2fb2b7dcf97a3f00412bc9b34c2e48ff', 'ee0d6e2a82f55cd3f19c53891652082d6ed772f8'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['app/src/main/java/com/pedro/streamer/rotation/RotationActivity.kt']} | merge | large | month | easy |
232 | pedroSG94_RootEncoder_merge_0001 | pedroSG94/RootEncoder | master | Apache License 2.0 | 2,416 | 2017-01-21T07:32:49 | aac;amf;android;av1;encoder;filters;g711;h264;h265;java;kotlin;mpeg2-ts;opus;rtmp;rtp;rtsp;srt;stream;streaming;udp | kotlin | {'merge_commit_hash': '48a453c38415d78411f9847bf124d962aeecab56', 'parents': ['3ce4201777277d0800d59fa71d948a358f7283c9', 'de6ad6b33cde61c6a75e3e59cd436965eeae49b8'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['srt/src/main/java/com/pedro/srt/srt/SrtSender.kt', 'udp/src/main/java/com/pedro/udp/UdpSender.kt']} | merge | large | month | hard |
233 | raamcosta_compose_destinations_merge_0000 | raamcosta/compose-destinations | main | Apache License 2.0 | 3,102 | 2021-09-01T11:17:50 | android;android-library;hacktoberfest;jetpack-compose;kotlin;kotlin-android;kotlin-library;ksp;navigation;safeargs | kotlin | {'merge_commit_hash': '158e4e7d7f6e85de83e2ca32072665873534d12e', 'parents': ['f5be0d0db38a8b37efa5dee338a9d85b411322d6', '737b2d0ea952febdab0af46daca59c7819d9e530'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['compose-destinations-ksp/src/main/kotlin/com/ramcosta/composedestinations/ksp/processors/KspToCodeGenDestinationsMapper.kt']} | merge | medium | month | easy |
234 | raamcosta_compose_destinations_merge_0001 | raamcosta/compose-destinations | main | Apache License 2.0 | 3,102 | 2021-09-01T11:17:50 | android;android-library;hacktoberfest;jetpack-compose;kotlin;kotlin-android;kotlin-library;ksp;navigation;safeargs | kotlin | {'merge_commit_hash': '3034bd3a31d4aa71a0c622999f1137d623bb56af', 'parents': ['53177086c1fbe52fe54ecb4a4e382eb417ba0638', '5424f7d225876bf0d79e2aee558ddb48281ea946'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['compose-destinations-codegen/src/main/java/com/ramcosta/composedestinations/codegen/writers/sub/DestinationContentFunctionWriter.kt', 'compose-destinations/src/main/java/com/ramcosta/composedestinations/result/ResultBackNavigatorImpl.kt', 'playground/app/src/main/java/com/ramcosta/samples/playground/AppNavigation.kt']} | merge | medium | month | hard |
235 | raamcosta_compose_destinations_merge_0002 | raamcosta/compose-destinations | main | Apache License 2.0 | 3,102 | 2021-09-01T11:17:50 | android;android-library;hacktoberfest;jetpack-compose;kotlin;kotlin-android;kotlin-library;ksp;navigation;safeargs | kotlin | {'merge_commit_hash': '8f3df0bc89a77d8eb25a7fd6abb1f44cff86772b', 'parents': ['b5bf69074e69843729650e594573df33de647dee', 'abafe8f3e81135ca8f5493b4137d068185c67d16'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['buildSrc/src/main/java/Versions.kt']} | merge | medium | month | medium |
214 | stripe_stripe_android_merge_0001 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '633fc826c5688137840c983c712d5b7bf6676981', 'parents': ['296b1478c53e930cd861923d77bc0a584d0fde95', 'eac671dc93a8128fa36b5255eee15e82b586b0c2'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/di/FinancialConnectionsSheetSharedModule.kt']} | merge | huge | week | easy |
302 | stripe_stripe_android_merge_0007 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '0b145f26f7ac10f276bc357284c7001e731efcd5', 'parents': ['91866cd436bd997adf798d08609ae8eaf6ee7a03', '5e693bb5bf07792ce7d1df5970259ff50a26c4f8'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['financial-connections-example/src/main/java/com/stripe/android/financialconnections/example/data/BackendRepository.kt']} | merge | huge | week | easy |
424 | stripe_stripe_android_merge_0020 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'b05e4b23eae34eb91421943946487c32181dea0d', 'parents': ['08acfe011bd30d882f85aad717f51b3a6c832949', 'ade3e46dfaca4aa18f480c4e2d2f09542c23aba0'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['payments-core/src/main/java/com/stripe/android/model/LuxePostConfirmActionRepository.kt']} | merge | huge | week | easy |
236 | stripe_stripe_android_merge_0002 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '43eb55a3079f7f9c84b666a5f5ea961835055487', 'parents': ['db2b9596b83d5c3a7346eec3d1aa50c554e855ab', '728b2da18ba3a9541efabb86358f9e21e1ddccd4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['financial-connections/src/test/java/com/stripe/android/financialconnections/features/partnerauth/PartnerAuthViewModelTest.kt']} | merge | huge | week | easy |
420 | stripe_stripe_android_merge_0016 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '939f5e02d531c6336f72f193f97e4f9d52ebfbd2', 'parents': ['7f00d336da5c84417690bc4533862ed969018e9d', 'd9e9eb0ed4d23e1cc180b28722db1ba1641fd3d0'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/di/FinancialConnectionsSheetNativeModule.kt']} | merge | huge | week | easy |
4,975 | stripe_stripe_android_merge_0033 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'e371eafc2b5a94567cd96ad4f5b0734951d2f88b', 'parents': ['7a1f54da8265593d3305531924fb80f818426076', '167fe2ad6f2a3c847e9448866fd5af71c92ae380'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['paymentsheet/src/test/java/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormViewModelTest.kt']} | merge | huge | week | easy |
238 | stripe_stripe_android_merge_0004 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '76e0e07a640e8613a1f5c4847011fad5b0287097', 'parents': ['5f83a85ddd0c3ea17b4ad2f734479542ad17b246', 'f594234e43b4fd376c4c771f332b947433ee7ff5'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/PostalCodeConfig.kt']} | merge | huge | week | easy |
4 | stripe_stripe_android_merge_0028 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '7d46296dbb894d6c26043c0449be7af9efa69cc0', 'parents': ['ab9399c1399fd89e45f27472da44a88f96e7ffab', '442ffa1a0b93aa98a204e8c7f4aa399859812ade'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentMethodsUI.kt']} | merge | huge | week | easy |
4,972 | stripe_stripe_android_merge_0030 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '1890249ad4b21247965f102a5f08d7660d35eed7', 'parents': ['49263ece9260ef7d6ff29149f4786c278c11bc43', 'e62bc3652a6652c9ec39acb9c3c84d3fdad22472'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/FinancialConnectionsSheetState.kt']} | merge | huge | week | easy |
7,406 | stripe_stripe_android_merge_0040 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '3deafc94321ecae4caa5aabc60ee18c9d7cafe85', 'parents': ['3b55fa23d55bb50f782f7ef4bff7378b2dc32b27', '7a34cb6a73dce3faa1359686c75ccba5f129e908'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['payments-ui-core/src/main/java/com/stripe/android/ui/core/forms/resources/LpmRepository.kt', 'paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentSheetListFragmentTest.kt']} | merge | huge | week | hard |
426 | stripe_stripe_android_merge_0022 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '95a4467f95bc9912eb339e064c0171d4657a8c23', 'parents': ['328fcf0b8b6d30d3de12857fca0391a6f298f62d', '6736fd680f56b0afb2fc2c3437b6888cc3b24d43'], 'number_of_files_with_merge_conflict': 6, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/analytics/FinancialConnectionsEvent.kt', 'financial-connections/src/main/java/com/stripe/android/financialconnections/features/common/SharedPartnerAuth.kt', 'financial-connections/src/main/java/com/stripe/android/financialconnections/features/consent/ConsentViewModel.kt', 'financial-connections/src/main/java/com/stripe/android/financialconnections/features/partnerauth/PartnerAuthViewModel.kt', 'financial-connections/src/test/java/com/stripe/android/financialconnections/TestFinancialConnectionsAnalyticsTracker.kt', 'financial-connections/src/test/java/com/stripe/android/financialconnections/features/partnerauth/PartnerAuthViewModelTest.kt']} | merge | huge | week | hard |
6,510 | stripe_stripe_android_merge_0037 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'a005c4d3265c072275ff8ce846ab0d43bdd13d65', 'parents': ['f9fbdb7fa1d85bfba24d4b55ce12c4f17b04d5a3', 'e22073414991922c5e0e6e660aecf629dfdc294d'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/di/FinancialConnectionsSheetNativeModule.kt', 'financial-connections/src/main/java/com/stripe/android/financialconnections/features/partnerauth/PartnerAuthViewModel.kt', 'paymentsheet/src/main/java/com/stripe/android/customersheet/CustomerSheetCompose.kt']} | merge | huge | week | hard |
425 | stripe_stripe_android_merge_0021 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '08acfe011bd30d882f85aad717f51b3a6c832949', 'parents': ['cba758cbfbcec2ee717c2739371565bed4cd571d', 'dc5da447dd4f759f6f5190c660dc2190a487b6a7'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['payments-core/src/main/java/com/stripe/android/model/LuxeActionCreatorForStatus.kt', 'payments-core/src/main/java/com/stripe/android/model/LuxeNextActionRepository.kt']} | merge | huge | week | hard |
4,976 | stripe_stripe_android_merge_0034 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '5c4e848c8d24e2e7617ab1586fef1c984bd13722', 'parents': ['efa9dd147a6a223b3f00a17fa83f53b619354aad', '344d10189f624db3697f30797fb616e1a10e5ff4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['payments-ui-core/src/main/java/com/stripe/android/ui/core/forms/resources/LpmRepository.kt']} | merge | huge | week | medium |
4,973 | stripe_stripe_android_merge_0031 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'efe00bb036a093de4c513bc41fabdae5621b8703', 'parents': ['7322b9f29179a7464397b5f5a02762d3f1443826', '67bbb6252d4fda8458be326683b547ea0f560d6d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/features/partnerauth/PartnerAuthScreen.kt']} | merge | huge | week | medium |
300 | stripe_stripe_android_merge_0006 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '12f928b5f103533c8674aeaec1be0636c6c29e38', 'parents': ['5201342c312415a0c34a0c33250ba39883baea00', '5599ee89098d7de93fcf3b306ac0eae2a5b77b01'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['financial-connections/src/test/java/com/stripe/android/financialconnections/repository/FinancialConnectionsRepositoryImplTest.kt']} | merge | huge | week | medium |
488 | stripe_stripe_android_merge_0026 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'da37ad774166f3def0294a2dce34d96f42efbee1', 'parents': ['d212d9b0f713fab0e76beccd84cfbc48b9136e60', '07898a0226e2393b6c8788b2939dce3f50a1f738'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/features/linkaccountpicker/LinkAccountPickerViewModel.kt']} | merge | huge | week | medium |
373 | stripe_stripe_android_merge_0014 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'ed9a05bd30bf2170b0566378b16b82aeb319d8ea', 'parents': ['786e76bb8e64d5a7bbe0d52af5600c19319330b8', '2ff83ed4c117de65bd828552cab4823ff63861e9'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['financial-connections-example/src/main/java/com/stripe/android/financialconnections/example/FinancialConnectionsDataExampleActivity.kt']} | merge | huge | week | medium |
370 | stripe_stripe_android_merge_0011 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'd3c8834a0780327bce0d2429894f3e4ea539ca1c', 'parents': ['36bdc10de12419bee64e148f29202a7323e0f0a2', '916eb9effa9f460971d9e0554d79f6b314653e31'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['stripe-ui-core/src/test/java/com/stripe/android/uicore/elements/PhoneNumberFormatterTest.kt']} | merge | huge | week | medium |
375 | vitorpamplona_amethyst_merge_0000 | vitorpamplona/amethyst | main | MIT License | 1,056 | 2023-01-11T06:28:30 | android;kotlin;nostr;social-network | kotlin | {'merge_commit_hash': 'c281654e972537d31689d2b6fcf08e509283312b', 'parents': ['c0ee8e2d61b65afa320ba434ac9e272a48a06113', 'c37adfc6a2d72a0721b30e99a88ea813a80de63e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt']} | merge | large | week | easy |
376 | vitorpamplona_amethyst_merge_0001 | vitorpamplona/amethyst | main | MIT License | 1,056 | 2023-01-11T06:28:30 | android;kotlin;nostr;social-network | kotlin | {'merge_commit_hash': '5753472a44f3908fef724820fb47ab8408a4eaf1', 'parents': ['788b7545c524b6be4d400c4da8bc969f22c27b85', 'e3ccf71a84c190926562c6c5709e4dbe2b5acca7'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt']} | merge | large | week | medium |
487 | wikimedia_apps_android_wikipedia_merge_0006 | wikimedia/apps-android-wikipedia | main | Apache License 2.0 | 2,228 | 2013-10-25T02:31:39 | android;android-app;java;kotlin;mediawiki;mediawiki-api;rest-api;rxjava-android;wiki;wikipedia;wikipedia-android | kotlin | {'merge_commit_hash': 'b08f6a1520b1715f3ab2bbfa7bad2e9f41ba1dd9', 'parents': ['fb227071e168d4e1e2b085e0c31cbaef63e8e57e', '0e5a1f95e99da7986c9b303a5cb55c8a03f83f94'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpConnectionFactory.kt']} | merge | large | week | easy |
15,268 | wikimedia_apps_android_wikipedia_merge_0010 | wikimedia/apps-android-wikipedia | main | Apache License 2.0 | 2,228 | 2013-10-25T02:31:39 | android;android-app;java;kotlin;mediawiki;mediawiki-api;rest-api;rxjava-android;wiki;wikipedia;wikipedia-android | kotlin | {'merge_commit_hash': '6660c6a6fac1e416ddfb421660bbea42be698a3e', 'parents': ['46d77c54d844ad205a17fa26575971c994bd330c', 'f07f4f1a581b28df62b47c35670aaae1a1361840'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['app/src/main/java/org/wikipedia/edit/SyntaxHighlightableEditText.kt']} | merge | large | week | easy |
379 | wikimedia_apps_android_wikipedia_merge_0002 | wikimedia/apps-android-wikipedia | main | Apache License 2.0 | 2,228 | 2013-10-25T02:31:39 | android;android-app;java;kotlin;mediawiki;mediawiki-api;rest-api;rxjava-android;wiki;wikipedia;wikipedia-android | kotlin | {'merge_commit_hash': 'fbb8eeee32bb0cd2697128935a7bb704ede72f0d', 'parents': ['99f46d4f5141fbf48d469887549e66aedc1f542d', 'e8172b317537600e862627efb68d037bc871b008'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['app/src/main/java/org/wikipedia/auth/AccountUtil.kt', 'app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.kt', 'app/src/main/java/org/wikipedia/edit/EditSectionActivity.kt', 'app/src/main/java/org/wikipedia/main/MainFragment.kt', 'app/src/main/java/org/wikipedia/settings/Prefs.kt']} | merge | large | week | hard |
480 | wikimedia_apps_android_wikipedia_merge_0003 | wikimedia/apps-android-wikipedia | main | Apache License 2.0 | 2,228 | 2013-10-25T02:31:39 | android;android-app;java;kotlin;mediawiki;mediawiki-api;rest-api;rxjava-android;wiki;wikipedia;wikipedia-android | kotlin | {'merge_commit_hash': 'fab29e71856b3e0e4c5afee9edf5adffe848a1d8', 'parents': ['8b6d8c12e257ee9cc63465f475d6cb60c241136c', 'c36cef205d95993d3cb5382ab820a5f83d93ba1d'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['app/src/main/java/org/wikipedia/WikipediaApp.kt', 'app/src/main/java/org/wikipedia/csrf/CsrfTokenClient.kt', 'app/src/main/java/org/wikipedia/login/LoginActivity.kt']} | merge | large | week | hard |
15,270 | wikimedia_apps_android_wikipedia_merge_0012 | wikimedia/apps-android-wikipedia | main | Apache License 2.0 | 2,228 | 2013-10-25T02:31:39 | android;android-app;java;kotlin;mediawiki;mediawiki-api;rest-api;rxjava-android;wiki;wikipedia;wikipedia-android | kotlin | {'merge_commit_hash': '1309dbef25b517ddc85fbdbf40fb62a8dcffa60f', 'parents': ['8374b847033bc62d652d6073bb758995bfb21110', 'fe2cdd6ff212c214ab3710800c86ea7356c106cc'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['app/src/main/java/org/wikipedia/edit/SyntaxHighlightViewAdapter.kt', 'app/src/main/java/org/wikipedia/gallery/GalleryActivity.kt', 'app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.kt', 'app/src/main/java/org/wikipedia/places/PlacesFragment.kt', 'app/src/main/java/org/wikipedia/talk/UserTalkPopupHelper.kt']} | merge | large | week | hard |
482 | wikimedia_apps_android_wikipedia_merge_0005 | wikimedia/apps-android-wikipedia | main | Apache License 2.0 | 2,228 | 2013-10-25T02:31:39 | android;android-app;java;kotlin;mediawiki;mediawiki-api;rest-api;rxjava-android;wiki;wikipedia;wikipedia-android | kotlin | {'merge_commit_hash': '918f9771fcecc7b3dae0054cae41701b72560b71', 'parents': ['c8a440e08f8e7d8d835dad889402ce96997c2560', 'f9d8df704f991be16a8210fc1809d3d9630b807e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['app/src/main/java/org/wikipedia/page/tabs/TabActivity.kt']} | merge | large | week | medium |
483 | yiiguxing_translationplugin_merge_0000 | yiiguxing/translationplugin | master | MIT License | 10,973 | 2016-06-01T08:39:51 | android-studio;deveco-studio;intellij;intellij-plugin;jetbrains-ides;plugin;translate;translate-plugin;translation | kotlin | {'merge_commit_hash': 'b628869461a70a89b0257924f7580742393c7f32', 'parents': ['9d23845f21d4ea143fdbbae2136c6df1ea6544c8', '68dfc7ed2070c36969d7aad6779a166e68cc2a0f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/kotlin/cn/yiiguxing/plugin/translate/action/SwitchEngineAction.kt']} | merge | medium | week | easy |
4,216 | airbnb_showkase_merge_0004 | 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': 'cd439e5ea83905fb2dd29af5dc19717401807b54', 'parents': ['4fe119360fcb78ec897b73be46bf865dfa73fc26', '48c25fb988f29e0bbd6c48e8970735b4cf8c4220'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['showkase-processor/src/main/java/com/airbnb/showkase/processor/models/ShowkaseMetadata.kt']} | merge | medium | week | easy |
304 | jetbrains_compose_multiplatform_merge_0001 | 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': '2bb6244f7a92be8b74fe7c6b615261fc352824bc', 'parents': ['19ae5f9ca10a814b2f82b3121c58e3cd23567d5b', '073e5e9db6c0404a9ac43e6552b06187cfd1d3fc'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/TestCases1.kt', 'web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/IntegrationTests.kt']} | merge | medium | week | hard |
4,987 | jetbrains_ideavim_merge_0008 | jetbrains/ideavim | master | MIT License | 8,849 | 2011-03-09T03:22:27 | ideavim;intellij;intellij-platform;intellij-plugin;jb-official;jetbrains;kotlin;vim | kotlin | {'merge_commit_hash': '7d679e68dcf7263ed2a09802759657fb0ac7b5d8', 'parents': ['1a4333fa1b56504670b715a8814cf3fa0ca87260', 'bc808403fb1f4b98efc7fefa93e271cc52e287ce'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimEditorGroup.kt', 'vim-engine/src/main/kotlin/com/maddyhome/idea/vim/impl/state/VimStateMachineImpl.kt']} | merge | large | week | hard |
5,044 | coil_kt_coil_merge_0005 | 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': '1cb44b63e0302a250e71855b4c728b89320ae265', 'parents': ['da5697b06e6dc573ebdfd92afb23e4083020d089', 'f7c7cdff9ae7be1e6b622a2cd26544a5393e001c'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['coil-compose-core/src/commonMain/kotlin/coil3/compose/AsyncImage.kt', 'coil-compose-core/src/commonMain/kotlin/coil3/compose/utils.kt']} | merge | medium | week | hard |
196 | cashapp_redwood_merge_0001 | cashapp/redwood | trunk | Apache License 2.0 | 1,493 | 2020-10-19T02:20:09 | unavailable | kotlin | {'merge_commit_hash': 'fde3f4afa01b299fb25cf5d3a1e1acb7274610e4', 'parents': ['8fcab23dbab1abf6111d548ff9b50cf007c4cc70', '2bfc2bb90a6c52a9bb2873091df2c970554ba153'], '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-uiview/src/commonMain/kotlin/app/cash/redwood/layout/uiview/utils.kt', 'redwood-layout-view/src/main/kotlin/app/cash/redwood/layout/view/ViewFlexContainer.kt', 'samples/emoji-search/presenter/src/commonMain/kotlin/com/example/redwood/emojisearch/presenter/EmojiSearch.kt']} | merge | medium | week | hard |
308 | stripe_stripe_android_merge_0008 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'b103ca53a3356dacf4757207087dda2d68de84cd', 'parents': ['c6e5316fff8d7e3d4785f9c479f4f7e6f5263cd4', 'a918d0a4c4588a459b077a8f6acae23bf5066265'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/di/FinancialConnectionsSheetNativeModule.kt']} | merge | huge | week | easy |
366 | airbnb_showkase_merge_0002 | 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': '0f3151bd7e0885ae73894d77a8c8bf644af36971', 'parents': ['d11effe8b469d2a44f0e86b730b18cd44d76be9a', '97d5311c8582c1cc17473d26a6145404371d0ddb'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['showkase-component-impressions/src/main/java/com/vinaygaba/showkase_component_impressions/ComponentImpressions.kt']} | merge | medium | week | easy |
369 | duckduckgo_android_merge_0000 | duckduckgo/android | develop | Apache License 2.0 | 3,591 | 2017-01-13T05:11:25 | android;duckduckgo;duckduckgo-android;hacktoberfest;translations | kotlin | {'merge_commit_hash': '77409df2a00cd3912b80a7fdca5df260fee9734e', 'parents': ['456fb266d6ca78d18dfe9908f2eb4994ce2fce1b', 'dc1048c1aeda1a4d06985fda63dff27ea905737c'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt', 'app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt', 'app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt']} | merge | large | week | hard |
243 | airbnb_showkase_merge_0001 | 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': '9e6873ca622d67f43841d95ff66a7fd4e39ba04b', 'parents': ['7219a1703a1c37056ef91cdb3fe6e7a97d4e9324', '646f44bb77d2f1ff02e3ed1421ccfed65a9639a5'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['showkase-processor/src/main/java/com/airbnb/showkase/processor/models/ShowkaseMetadata.kt', 'showkase-processor/src/main/java/com/airbnb/showkase/processor/writer/ShowkaseCodegenMetadataWriter.kt']} | merge | medium | week | hard |
374 | stripe_stripe_android_merge_0015 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'a0b618626f7faede85db53a215c6f56ef9dbc7f4', 'parents': ['69e234ba1cd9c1bc6012a59670e2859048d42dc9', '2f93daa301f57e2690b07d258a872e4541c497e9'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['stripe-ui-core/src/main/java/com/stripe/android/uicore/elements/PhoneNumberElementUI.kt']} | merge | huge | week | medium |
7,777 | element_hq_element_android_merge_0034 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': 'e87d97083fc5a6896ec8dfb326265994484c6e34', 'parents': ['36fc2fb51e526b2811de8ad7b8cae9311d83de43', '2a32a780cfe9a29abdf20583aeffc08cf367d8e9'], '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/api/session/room/model/VersioningState.kt']} | merge | large | week | easy |
428 | stripe_stripe_android_merge_0024 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'a7eba142ba1984374388b876cdc5fc8109c08653', 'parents': ['c2a2229be6ef73d56363db5810f44f108d8afd32', '45297204b02e48fd8fa996737c172f962abd40f8'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['paymentsheet/src/main/java/com/stripe/android/paymentsheet/BaseAddPaymentMethodFragment.kt', 'paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentMethodsUI.kt']} | merge | huge | week | hard |
7,407 | stripe_stripe_android_merge_0041 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '9f9039db6b7a8e8774ebe585032e37faa335fb81', 'parents': ['82e29a7f2fa368b14eb0d45b4ad1d47810f82574', 'c80ac9d46b7fd0d07c92648b39f5a31f061cfadb'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/di/FinancialConnectionsSheetComponent.kt']} | merge | huge | week | easy |
382 | corda_corda_merge_0002 | 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': 'f0f05df9f4bc9acee42d0d56fa19fb9f14ad2186', 'parents': ['f9c034aa7c1e18a4c86e875cd8e79761790dc5d3', 'f01f8a129ed7f25a6471c868e45c419038caae94'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['core/src/test/kotlin/net/corda/core/flows/CollectSignaturesFlowTests.kt']} | merge | large | month | easy |
255 | mockk_mockk_merge_0000 | mockk/mockk | master | Apache License 2.0 | 5,304 | 2017-10-17T10:31:23 | argument-matchers;chain-calls;hacktoberfest;kotlin;matcher;mock;mocking-framework;tdd;testing;verification | kotlin | {'merge_commit_hash': '58b2c376a571545de499057826dd333927861f4d', 'parents': ['444474a5987476a95256cd2145262366a7150ace', 'b0fe0ad2284ab3677a8eb477a68b8c6f28a3af32'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['dsl/jvm/src/main/kotlin/io/mockk/InternalPlatformDsl.kt']} | merge | medium | month | easy |
213 | aniyomiorg_aniyomi_merge_0001 | aniyomiorg/aniyomi | master | Apache License 2.0 | 4,331 | 2021-04-17T01:35:37 | android;anime;manga | kotlin | {'merge_commit_hash': '3f66042d89a6b8fe8222fbcf5472601459259e78', 'parents': ['834d0d822ba4629b526a9eabaf5ea4792c7e8d0d', 'ba1a2e99427682b89a1a1fbfa95633c075832125'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt', 'app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt']} | merge | large | week | hard |
297 | element_hq_element_android_merge_0011 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '90ccc3006d57d2e7157cb4025054f7b5eedbe884', 'parents': ['e67cb0eae7ac7f5777bdf9249babca09dd1083b8', '72b1bd354e24888094aa02c8c6d7971a82cd807d'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt', 'vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt']} | merge | large | week | hard |
322 | kickstarter_android_oss_merge_0000 | kickstarter/android-oss | master | Apache License 2.0 | 5,741 | 2016-12-12T05:15:41 | android;android-development;frp;functional-programming;functional-reactive-programming;kotlin-android;rxjava | kotlin | {'merge_commit_hash': 'f336ff61a05776c02482ad2485a12c93f2a0da76', 'parents': ['0ab53734efb5ddb23de76613855d01e4b8fd3ce3', '644bf1db5b7043f5503cb9b85f16e254474387c2'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['app/src/main/java/com/kickstarter/mock/services/MockApolloClient.kt', 'app/src/main/java/com/kickstarter/services/KSApolloClientV2.kt']} | merge | large | week | hard |
365 | jetbrains_compose_multiplatform_merge_0006 | 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': '1bcdf35991f2eed03109b0bca0bec81fad581ae6', 'parents': ['8b6b4ae3e68abea36254a0ecc3d076536e349170', 'ef04feee54f1d757114f0811c59052447c584767'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['examples/imageviewer/shared/src/iosMain/kotlin/example/imageviewer/platform.ios.kt']} | merge | medium | week | easy |
44 | jetbrains_exposed_merge_0005 | jetbrains/exposed | main | Apache License 2.0 | 7,963 | 2013-07-30T12:55:27 | dao;kotlin;orm;sql | kotlin | {'merge_commit_hash': '0bb99eb9eaf62ba17ae648522328148376575145', 'parents': ['e171bc00cb6df5e5422418f7d5fad2c201039f37', 'a50062536bbf54035431dbd2206690708672a87b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['exposed/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DMLTests.kt']} | merge | medium | week | easy |
278 | getsentry_sentry_java_merge_0000 | 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': '9400a821b285c9d95adfc16f5c9b2166987a5f1a', 'parents': ['79658dbc9cfbe757e4e5e9c13799b4c2df764133', '193345bb9f37fa7ad8e33b9a17fdb4a323ecab90'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['sentry/src/main/java/io/sentry/DateUtils.java', 'sentry/src/test/java/io/sentry/HubTest.kt']} | merge | large | month | hard |
6,442 | element_hq_element_android_merge_0030 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': '0803f25a3216eb19bb5e49b55e7dde990ab18afe', 'parents': ['7ad39fdc9970323b48c60840a07e742da3c173e9', '1fe4ecee99eef41d6ca70109fe5dc92fabbdbfba'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt', 'matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt']} | merge | large | week | hard |
6,511 | stripe_stripe_android_merge_0038 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'cca4dd54e87df59b89c9b32dcea24110044f6975', 'parents': ['046726edbfabc036508a40e1ac6e5dca3f0ac7e3', '416002325ef2e598681d7550c3430c859782a655'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/features/linkstepupverification/LinkStepUpVerificationScreen.kt', 'financial-connections/src/main/java/com/stripe/android/financialconnections/features/networkinglinkverification/NetworkingLinkVerificationScreen.kt', 'financial-connections/src/main/java/com/stripe/android/financialconnections/features/networkingsavetolinkverification/NetworkingSaveToLinkVerificationScreen.kt']} | merge | huge | week | hard |
326 | kotlin_dokka_merge_0002 | kotlin/dokka | master | Apache License 2.0 | 3,290 | 2014-07-12T09:15:22 | api-reference;documentation;dokka;kotlin | kotlin | {'merge_commit_hash': 'f2586342de8f5f9ccc9be116e1ea6496861301a7', 'parents': ['eceb73c24e4c52a4e6f0e85bdf7a958ef7811e50', '9a875a9440d31ce18233cbfc3436a04622580194'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['core/src/main/kotlin/DokkaBootstrapImpl.kt', 'core/src/main/kotlin/Kotlin/DocumentationBuilder.kt', 'runners/gradle-plugin/src/main/kotlin/main.kt']} | merge | large | month | hard |
336 | jetbrains_exposed_merge_0003 | jetbrains/exposed | main | Apache License 2.0 | 7,963 | 2013-07-30T12:55:27 | dao;kotlin;orm;sql | kotlin | {'merge_commit_hash': 'c009a6faff2ab652152a03e924d0d89dcfb3b6f4', 'parents': ['b677ecdabf8ac89be80076e72b0d183690212260', 'b6945287be610b7f35d4d22be0bae40eb1f8cfc8'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/ColumnType.kt', 'exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/Database.kt', 'exposed-tests/src/main/kotlin/org/jetbrains/exposed/sql/tests/DatabaseTestsBase.kt', 'exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/dml/ReplaceTests.kt']} | merge | medium | week | hard |
247 | android_nowinandroid_merge_0001 | android/nowinandroid | main | Apache License 2.0 | 15,451 | 2022-04-19T08:40:24 | android;jetpack-compose;kotlin | kotlin | {'merge_commit_hash': '69f4287ab5acd6b15da50b86a46deac3729be250', 'parents': ['2ad48843f6dbb5eee54c60b1a5600597dc7f23a0', '6add4d68e310a78fe465cbfdae36b89cde27b1af'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt']} | merge | medium | month | easy |
372 | stripe_stripe_android_merge_0013 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': 'c2dd5a1e6347ce7f865f008c0eaed35516cb35f0', 'parents': ['eb83f07357ae46af1dcb0d12254fc50137b21e7a', '8b0cb37502dedef6dfbf6186bbe8e8144bb33860'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/FinancialConnectionsSheetViewModel.kt']} | merge | huge | week | medium |
385 | duckduckgo_android_merge_0002 | duckduckgo/android | develop | Apache License 2.0 | 3,591 | 2017-01-13T05:11:25 | android;duckduckgo;duckduckgo-android;hacktoberfest;translations | kotlin | {'merge_commit_hash': '833e270247f8c27870b280c3ee795dc687970285', 'parents': ['6286d3b00e4550c31d6bfb07b6c5dafa4d49d257', '01bf9097f913325ba5470bff2b996fc03d88c00e'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['app/src/main/java/com/duckduckgo/app/browser/tabpreview/TabEntityDiffCallback.kt', 'app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt']} | merge | large | week | hard |
331 | jetbrains_compose_multiplatform_merge_0003 | 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': '5a5b541785b02f7708096f855d273b84b50db362', 'parents': ['8c2b0db5caa4c4ce96f665a622ef7d6a98e5af2f', 'e90b98158750805d1abd708de17a02c95580b087'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['components/resources/library/src/wasmMain/kotlin/org/jetbrains/compose/resources/Resource.wasm.kt']} | merge | medium | week | easy |
46 | android_compose_samples_merge_0003 | android/compose-samples | main | Apache License 2.0 | 19,021 | 2019-09-27T09:51:19 | android;jetpack-compose | kotlin | {'merge_commit_hash': 'c2b7327b3e4497989efab19cb88f35e5a36d0ac9', 'parents': ['cbac19caa61030bb39f16630d2bfa852ca698ea7', 'bc2f4f16dce4803abe9757fa98ff079ec0a6a959'], '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 |
239 | stripe_stripe_android_merge_0005 | stripe/stripe-android | master | MIT License | 1,226 | 2012-11-29T06:11:30 | stripe;stripe-sdk | kotlin | {'merge_commit_hash': '497bb00d84b731ab8327e5b328ae8efc966ede4c', 'parents': ['16b8c560c74f798f8f8e929d9492dc884077d856', 'b9967e3732fbbeee09b7f6a048df406b693f2195'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['financial-connections/src/main/java/com/stripe/android/financialconnections/ui/theme/Theme.kt']} | merge | huge | week | easy |
14,883 | wikimedia_apps_android_wikipedia_merge_0009 | wikimedia/apps-android-wikipedia | main | Apache License 2.0 | 2,228 | 2013-10-25T02:31:39 | android;android-app;java;kotlin;mediawiki;mediawiki-api;rest-api;rxjava-android;wiki;wikipedia;wikipedia-android | kotlin | {'merge_commit_hash': 'f37b3adf7f86bb5853e4fa80e03948190f93bb6e', 'parents': ['3b612f16c2791ffd207167b03df2659022bc237b', 'ec537c6b884b589f056ea67b3a5b86168449bc64'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['app/src/main/java/org/wikipedia/bridge/JavaScriptActionHandler.kt', 'app/src/main/java/org/wikipedia/page/PageFragment.kt']} | merge | large | week | hard |
216 | coil_kt_coil_merge_0002 | 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': 'bfb26920fa7aa5bb60199738540d64e4895fcf00', 'parents': ['7900691e236099af3f60014b50c8c137d29c2f74', '562ea063d5395d043c1b60493f8852680ed6d171'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['coil-compose-base/src/main/java/coil/compose/ImagePainter.kt']} | merge | medium | week | easy |
14,180 | kotlin_dokka_merge_0006 | kotlin/dokka | master | Apache License 2.0 | 3,290 | 2014-07-12T09:15:22 | api-reference;documentation;dokka;kotlin | kotlin | {'merge_commit_hash': 'd6205fb8cddb6c919b42c34a847e0223e3afec11', 'parents': ['853262e758c8f7c6eb9e2cfd0ffd982f9a0ef5b0', 'ad35def2efbb6eae6fae423bb639890aaa2cb93f'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['core/src/main/kotlin/DokkaBootstrapImpl.kt', 'core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlPackageListService.kt', 'core/src/main/kotlin/Kotlin/DocumentationBuilder.kt', 'runners/gradle-plugin/src/main/kotlin/main.kt']} | merge | large | month | hard |
4,469 | jetbrains_ideavim_merge_0007 | jetbrains/ideavim | master | MIT License | 8,849 | 2011-03-09T03:22:27 | ideavim;intellij;intellij-platform;intellij-plugin;jb-official;jetbrains;kotlin;vim | kotlin | {'merge_commit_hash': '9e3ca56afd317a3d087041a72a366edb58d5dca3', 'parents': ['5379528e3e0848286ed4fd8fd6a6e0c6aa962e98', 'ba50fcf85e72c074b1020161012c1c354d9c6ff5'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/main/java/com/maddyhome/idea/vim/ui/ex/ExEntryPanel.java', 'vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/ex/LeaveCommandLineAction.kt', 'vim-engine/src/main/kotlin/com/maddyhome/idea/vim/key/consumers/CommandConsumer.kt']} | merge | large | week | hard |
360 | element_hq_element_android_merge_0016 | element-hq/element-android | develop | Apache License 2.0 | 3,239 | 2018-10-02T03:56:15 | element-android;hacktoberfest;matrix | kotlin | {'merge_commit_hash': 'c148805db76de722d838a7075960378855f3c4b3', 'parents': ['b37800a5ebf32ab25fab317261a3b7953cacb19c', '4974fdf9058e073d99c4e5692b943e7c7fb98fed'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt', 'vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsTracker.kt']} | merge | large | week | hard |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.