Unnamed: 0
int64
0
17.5k
id
stringlengths
20
73
name
stringclasses
816 values
default_branch
stringclasses
31 values
license
stringclasses
4 values
stargazers
int64
1.01k
125k
created_at
stringdate
2008-08-28 06:58:04
2024-04-02 04:09:47
topics
stringclasses
675 values
programming_language
stringclasses
3 values
scenario
stringlengths
236
990
sample_type
stringclasses
2 values
project_size
stringclasses
5 values
project_activity
stringclasses
2 values
difficulty
stringclasses
3 values
132
flowable_flowable_engine_merge_0000
flowable/flowable-engine
main
Apache License 2.0
7,477
2016-10-13T07:21:43
bpmn;java;workflow;workflow-engine
java
{'merge_commit_hash': '65f1095d573834bcd5b4e8f8002e72604cd59f04', 'parents': ['439ea3524a8e542e447e4df06c0895d71910dcda', 'dfb155362b8625ebed15bbdc997149f941a97eea'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/CmmnDeploymentEntityManagerImpl.java', 'modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java', 'modules/flowable-eventsubscription-service/src/main/java/org/flowable/eventsubscription/service/impl/persistence/entity/EventSubscriptionEntityManagerImpl.java']}
merge
huge
month
hard
133
spring_projects_spring_boot_merge_0001
spring-projects/spring-boot
main
Apache License 2.0
73,085
2012-10-19T03:02:57
framework;java;spring;spring-boot
java
{'merge_commit_hash': '5c21c681465727773477868ec064c916f3732c9e', 'parents': ['c6c139d980a50a1b39e564d44a1df6d46f8ca11b', '0c74b3cd143a9d58944df2d454cb6b15a6a6f5dd'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java', 'spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java', 'spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java', 'spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java', 'spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java']}
merge
large
month
hard
134
wiremock_wiremock_merge_0001
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': '6201a98317c7362172f3b2d57f0f6d28f2515c94', 'parents': ['76a0acefc10231a5c2bfeece2eb621544bb7a350', '22a7b08e8c7ced7bc37693260e80669f2a011e5b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java']}
merge
medium
month
easy
135
neo4j_contrib_neo4j_apoc_procedures_merge_0000
neo4j-contrib/neo4j-apoc-procedures
4.4
Apache License 2.0
1,668
2016-02-25T08:33:37
graph-algorithms;graph-database;hacktoberfest;neo4j;neo4j-plugin;stored-procedures
java
{'merge_commit_hash': '96fa0262e1959f94fd268fb09124884b6c82eb80', 'parents': ['3a34d1b17785b34f45336ba9a619b098ddd2e180', '5ce7602c242612a08d6a2a6cd03df77446ffd2fc'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 8, 'files_in_merge_conflict': ['src/main/java/apoc/load/LoadLdap.java', 'src/test/java/apoc/load/LoadLdapTest.java']}
merge
large
month
hard
136
jenkinsci_jenkins_merge_0001
jenkinsci/jenkins
master
MIT License
22,483
2010-11-22T09:21:23
cicd;continuous-delivery;continuous-deployment;continuous-integration;devops;groovy;hacktoberfest;java;jenkins;pipelines-as-code
java
{'merge_commit_hash': '18b40501acf4537e1a76be9dbbb7db1e2547dd5f', 'parents': ['ec060fa305470faffbbd7ab1b5065600952928dc', '0916e5bd3cd45ef7a66757c6aefef21af59fa219'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['core/src/main/java/hudson/Util.java']}
merge
large
month
medium
137
nutzam_nutz_merge_0000
nutzam/nutz
master
Apache License 2.0
2,515
2011-06-10T01:25:43
aop;ioc;java;javaee;micro-framework;nutz;orm
java
{'merge_commit_hash': 'df3be2223d506bc30df889587a04c8d63169c964', 'parents': ['ae8f7170c47dc50dbf2ed8a49f92140f18775e81', '8a66976edfa9d8b9f205a9cbbc2a68d2a92b63ad'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/org/nutz/mapl/Mapl.java']}
merge
large
month
medium
138
gchq_gaffer_merge_0001
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': 'f907085ce4d70af45be124e09123715bfe112206', 'parents': ['1541f82113a2e70f98fd908d94a0641e2f32b368', '9c9ff985677e1655f4db1f9695578ec56fe31fa7'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/handler/impl/FederatedGetTraitsHandler.java']}
merge
large
month
easy
139
msgpack_msgpack_java_merge_0001
msgpack/msgpack-java
main
Apache License 2.0
1,382
2011-06-29T08:45:39
unavailable
java
{'merge_commit_hash': 'a58208589a2e0a8ba6763a0d88a5fba840d2f7c1', 'parents': ['cb7f64286fa4365fa68cd9d5ef29a77df712363d', '1bc8c85994d54c45624fec7bc018ff1a68ec0ef5'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java']}
merge
medium
month
easy
140
spring_projects_spring_security_merge_0000
spring-projects/spring-security
main
Apache License 2.0
8,451
2012-01-10T09:50:57
framework;java;security;spring;spring-framework
java
{'merge_commit_hash': 'ffe957748765748c63d398553959fdb1cb6f710d', 'parents': ['91f0a5a4344106edff6d614fa913314d3d0000d3', '7c3a6a567e2d8be4463c3055c2b839b149f38a17'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java']}
merge
large
month
medium
142
gnembon_fabric_carpet_merge_0001
gnembon/fabric-carpet
master
MIT License
1,610
2019-05-10T02:54:10
unavailable
java
{'merge_commit_hash': '2127c3ac8e7e64f822e6de0b98966398a3a0eb6a', 'parents': ['481fc975450ec58db1faf14f776205127b0365c0', '448fde1f36958f2b96594f8b032eb7abbc8c0534'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java', 'src/main/java/carpet/script/CarpetEventServer.java']}
merge
medium
month
hard
143
batfish_batfish_merge_0001
batfish/batfish
master
Apache License 2.0
1,033
2014-12-03T09:10:18
configuration;configuration-analysis;configuration-parser;network;network-analysis;network-automation;network-security;network-validation;network-verification
java
{'merge_commit_hash': '08ab702f1ba01b002272c1086420a2f1732776f3', 'parents': ['d85ab1a16cc74fab26f3ea903e638d8b9526e05f', '1653a29fc96df700db453e61cd12da0e21647d9a'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['projects/batfish/src/main/java/org/batfish/symbolic/abstraction/Abstraction.java', 'projects/batfish/src/main/java/org/batfish/symbolic/smt/PropertyChecker.java', 'projects/batfish/src/main/java/org/batfish/symbolic/utils/PrefixUtils.java']}
merge
large
month
hard
146
jenkinsci_jenkins_merge_0002
jenkinsci/jenkins
master
MIT License
22,483
2010-11-22T09:21:23
cicd;continuous-delivery;continuous-deployment;continuous-integration;devops;groovy;hacktoberfest;java;jenkins;pipelines-as-code
java
{'merge_commit_hash': '748e2f326e84a1f072cc976909da5cc7bc023210', 'parents': ['1312029b7ee7175054cdc4cbf1f5a47ec33a6117', '73afa0ca786a87f05b5433e2e38f863826fcad17'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['core/src/main/java/hudson/model/User.java', 'core/src/main/java/jenkins/util/VirtualFile.java']}
merge
large
month
hard
147
pig_mesh_pig_merge_0000
pig-mesh/pig
jdk17
Apache License 2.0
5,585
2019-08-26T03:24:53
docker;oauth2;rbac-management;spring-authorization-server;spring-boot;spring-cloud;spring-cloud-alibaba;spring-security;vue3
java
{'merge_commit_hash': '5bd49b3be5f42d6fdfe7ff6517981c32a08c4f6d', 'parents': ['e558af372a18f38f8b7c847aecd4f9dfce7e70dd', 'e7a20be23392bf744600ff88862b853668375f0e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['pig-common/pig-common-feign/src/main/java/org/springframework/cloud/openfeign/PigFeignClientsRegistrar.java']}
merge
medium
month
easy
149
fasterxml_jackson_core_merge_0000
fasterxml/jackson-core
2.18
Apache License 2.0
2,234
2011-12-23T02:00:51
hacktoberfest;jackson;json
java
{'merge_commit_hash': '4830bb268b925454c21cbd3998a406f37a04d607', 'parents': ['c4dd84e4d505baa90d8d1675c1f60f8d6ce90db8', '3d3dedc656e331ab1a9e28efcde96bf71c347daa'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/test/java/com/fasterxml/jackson/core/read/NonStandardParserFeaturesTest.java']}
merge
large
month
medium
150
apache_cloudstack_merge_0002
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': '8e4be6dc60ad2bed1d393384d00887b858ee7cf4', 'parents': ['b406e1dc4696d2b529add947fa5f81f358cf1cc5', '2637a86ac2018323f90625609263004d489a9156'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java']}
merge
huge
month
easy
152
spring_cloud_spring_cloud_netflix_merge_0001
spring-cloud/spring-cloud-netflix
main
Apache License 2.0
4,845
2014-07-11T03:46:12
cloud-native;feign;java;microservices;netflix-eureka;netflix-hystrix;netflix-zuul;netflixoss;ribbon;spring;spring-boot;spring-cloud;spring-cloud-core
java
{'merge_commit_hash': '8d3f87c87c11de4ffcee9df13ec0e517efc9f919', 'parents': ['c669868b36cf63bc681e7b4cb17495002d31b3f8', 'ff6b50d0a8f1acb6c07a6c873044b3d27a9d748a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/loadbalancer/EurekaLoadBalancerClientConfiguration.java']}
merge
medium
month
easy
153
graphhopper_graphhopper_merge_0001
graphhopper/graphhopper
master
Apache License 2.0
4,727
2012-02-18T07:57:38
astar;dijkstra;directions;geospatial;graphhopper;isochrones;java;map-matching;openstreetmap;pathfinding;public-transportation;routing;routing-engine
java
{'merge_commit_hash': '8aa51acc4fbf9a24f3fc77c6675bebfd5fc77f3c', 'parents': ['48a298e3022869599958f5f5d413e2565b6f83ff', 'c61cfdcbc9d00311719096bf757012a9fa43e9cc'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['core/src/main/java/com/graphhopper/routing/ch/CHAlgoFactoryDecorator.java', 'core/src/main/java/com/graphhopper/routing/ch/PrepareContractionHierarchies.java', 'core/src/main/java/com/graphhopper/storage/CHGraph.java', 'reader-osm/src/test/java/com/graphhopper/reader/osm/GraphHopperOSMTest.java', 'tools/src/main/java/com/graphhopper/tools/Measurement.java']}
merge
large
month
hard
155
apache_iotdb_merge_0001
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': '98eab0d389460605969f989b32ee6f37d1ef49c6', 'parents': ['7df7c57c69f00bb18e8db3ede75cd479946adbb1', '72020ef96b74c12de0d9eebd03b216e734872d4f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java']}
merge
large
month
easy
157
haraldk_twelvemonkeys_merge_0000
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': 'ef058729343c60b00fcb6a8d4b0d818a337a26ef', 'parents': ['1ddab866fd54b8bc89414db402b654640b4c34b9', 'ce997a69519efb9c0130e709cdc898c1e4ea2b33'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/tiff/TIFFWriter.java']}
merge
large
month
medium
159
pytorch_serve_merge_0000
pytorch/serve
master
Apache License 2.0
3,985
2019-10-03T03:17:43
cpu;deep-learning;docker;gpu;kubernetes;machine-learning;metrics;mlops;optimization;pytorch;serving
java
{'merge_commit_hash': '40bf26919b479163c877a0fd5d2af74005b4141b', 'parents': ['56ea5c17d0f8926b244b0752bf33f9828eded560', '7da9cb64024efaaf7a36366fab58893ddbd5d4bf'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['frontend/server/src/main/java/org/pytorch/serve/ServerInitializer.java', 'frontend/server/src/main/java/org/pytorch/serve/util/ConfigManager.java']}
merge
medium
month
hard
160
analogj_lexicon_merge_0000
analogj/lexicon
master
MIT License
1,449
2016-02-02T07:53:04
cli;clouddns;cloudflare;cloudxns;constellix;digitalocean;dns;dns-provider;dns-service;dnsimple;dnspod;gandi;godaddy;letsencrypt;lexicon;pypi;ssl-certificate;transip;vultr;yandex
python
{'merge_commit_hash': 'c203a26e7e950396fee76dc2d4bcb2bafc023b16', 'parents': ['135cfc89e63b7db5f3de190059c1710de8f97232', 'add7e92955bc9dc7c5e9f25194934b7a729ffe74'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['src/lexicon/_private/providers/misaka.py', 'src/lexicon/_private/providers/namecom.py', 'src/lexicon/_private/providers/oci.py', 'src/lexicon/_private/providers/valuedomain.py', 'src/lexicon/client.py']}
merge
large
month
hard
162
qutip_qutip_merge_0000
qutip/qutip
master
BSD 3-Clause New or Revised License
1,607
2012-10-09T06:20:46
python;quantum;quantum-computing;quantum-information;quantum-mechanics;quantum-optics;quantum-toolbox;qutip;unitaryhack
python
{'merge_commit_hash': '86526c82618976ec4d623500f92fa2b7564814b3', 'parents': ['ed3053d2bfbdd433a446d1d17e626e58b7713b94', 'f7bc01bc19b88a756bf3c4863ab14226c48212aa'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['qutip/qip/device/processor.py']}
merge
medium
month
medium
164
numba_numba_merge_0000
numba/numba
main
BSD 2-Clause Simplified License
9,519
2012-03-08T11:12:43
compiler;cuda;llvm;numba;numpy;parallel;python
python
{'merge_commit_hash': '669da7ee5b031a0d8264e25a5e73136b61e18720', 'parents': ['aa5f235749817c70ce9e95408d32bdb080694054', '10b6c376e2c06728412f483f0ce830f6d19ef89b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['numba/npyufunc/decorators.py']}
merge
large
month
easy
165
h2oai_h2ogpt_merge_0000
h2oai/h2ogpt
main
Apache License 2.0
10,487
2023-03-24T09:31:25
ai;chatgpt;embeddings;generative;gpt;gpt4all;llama2;llm;mixtral;pdf;private;privategpt;vectorstore
python
{'merge_commit_hash': '2b2572b3bc10dd0d108feedf60106d1040fda1ab', 'parents': ['a86687080b3bd98841a59f8bebba02f210578637', '72a3d924763e873162e922ff45bd36559dfe06ed'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/version.py']}
merge
large
month
easy
166
stripe_stripe_python_merge_0000
stripe/stripe-python
master
MIT License
1,553
2011-06-25T07:53:04
stripe;stripe-sdk
python
{'merge_commit_hash': 'f528e8b2c7f53dda75c6dacc6c245013702748c3', 'parents': ['289ca894194f757f5985b6defe5ff53e6963aaa5', 'bd1c58726ebcfd32fe3a3ab62c92b8565d190a4f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['tests/test_integration.py']}
merge
large
month
easy
167
vocodedev_vocode_python_merge_0000
vocodedev/vocode-python
main
MIT License
2,380
2023-02-24T06:44:46
unavailable
python
{'merge_commit_hash': '93ec0c3891ec1ba16088903e22fa1a458e8626be', 'parents': ['698536faa74bd1fcdda401b0418983c38481ee49', 'c580d13addca1b0bd283fb525c4fc42899fb418b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['vocode/streaming/synthesizer/base_synthesizer.py']}
merge
medium
month
easy
168
google_trax_merge_0000
google/trax
master
Apache License 2.0
7,964
2019-10-05T03:09:14
deep-learning;deep-reinforcement-learning;jax;machine-learning;numpy;reinforcement-learning;transformer
python
{'merge_commit_hash': '07746d700549707d80749f1db055e955a5315657', 'parents': ['0a02d5f470dcb4e14c8e2cb211a63a5fbb95a155', '43305760e772ece97858a9869f907198aa772797'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['trax/rl/actor_critic.py', 'trax/rl/training.py']}
merge
medium
month
hard
170
langchain_ai_langchain_merge_0000
langchain-ai/langchain
master
MIT License
83,836
2022-10-17T02:58:36
unavailable
python
{'merge_commit_hash': '1b35b29a422be50017da60a3ec9fac19aa07ac33', 'parents': ['6fd701df88a18dfbca6638ddab87efb1fac8b848', '13c6783e8fbd09da6fbdd8310c82400c77898832'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 8, 'files_in_merge_conflict': ['langchain/evaluation/comparison/eval_chain.py', 'langchain/evaluation/criteria/eval_chain.py', 'langchain/evaluation/qa/eval_chain.py', 'langchain/evaluation/schema.py']}
merge
large
month
hard
171
lightning_ai_torchmetrics_merge_0000
lightning-ai/torchmetrics
master
Apache License 2.0
1,971
2020-12-22T08:02:42
analyses;data-science;deep-learning;machine-learning;metrics;python;pytorch
python
{'merge_commit_hash': '5dc8fb445491d83fe334b626fd3e9eb3dbec89b3', 'parents': ['56f17fd34d02417a9c2b30975a33e4d72ad244da', '895cd6d996a48f0c5bad29bdada345c9ca4bd191'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/torchmetrics/utilities/__init__.py']}
merge
medium
month
easy
172
hpcaitech_Open_Sora_merge_0000
hpcaitech/Open-Sora
main
Apache License 2.0
17,065
2024-02-20T03:01:34
unavailable
python
{'merge_commit_hash': '0a9a662f921cc9c8ff2d29348130ca8640b98a6e', 'parents': ['0f907da4d2918c6dc3978983d07da91553e86809', 'a50df7dccf2589a7d0ba127d68d31452594d2240'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['opensora/models/stdit/stdit3.py', 'opensora/models/text_encoder/t5.py']}
merge
medium
month
hard
174
marqo_ai_marqo_merge_0000
marqo-ai/marqo
mainline
Apache License 2.0
4,147
2022-08-01T12:12:51
chatgpt;clip;deep-learning;gpt;hacktoberfest;hnsw;information-retrieval;knn;large-language-models;machine-learning;machinelearning;multi-modal;natural-language-processing;search-engine;semantic-search;tensor-search;transformers;vector-search;vision-language;visual-search
python
{'merge_commit_hash': '044acb8d640c66349fa08e20f89b9b5bf5c78c23', 'parents': ['d9208867db8da930594298eab72e8bb46fb9dac6', '4034d21ba6d787e707e1d3c22210f69213763e7e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/marqo/tensor_search/index_meta_cache.py']}
merge
medium
month
easy
175
tinygrad_tinygrad_merge_0000
tinygrad/tinygrad
master
MIT License
24,078
2020-10-18T04:23:12
unavailable
python
{'merge_commit_hash': 'd57d0e6fdf477fa8b88d7110333f590c8e5597ee', 'parents': ['14f2a6716e53f71f6db4648f6e43a4faac498764', '81bda4d3047bc6e6f3592c6fd5840c8ba99aec42'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['tinygrad/codegen/uopgraph.py']}
merge
large
month
easy
176
skypilot_org_skypilot_merge_0000
skypilot-org/skypilot
master
Apache License 2.0
5,685
2021-08-11T11:32:15
cloud-computing;cloud-management;cost-management;cost-optimization;data-science;deep-learning;distributed-training;finops;gpu;hyperparameter-tuning;job-queue;job-scheduler;llm-serving;llm-training;machine-learning;ml-infrastructure;ml-platform;multicloud;spot-instances;tpu
python
{'merge_commit_hash': '1b8385cceaed67a88f2bfa2fbd58666d944a4254', 'parents': ['96647bfa998bc003b603ee1428899982314e2639', 'fdff1a6a937d1ac2b79b1674f5fc0220c65f397c'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['sky/authentication.py', 'sky/backends/cloud_vm_ray_backend.py', 'sky/clouds/kubernetes.py', 'sky/utils/kubernetes_utils.py']}
merge
medium
month
hard
177
mindee_doctr_merge_0000
mindee/doctr
main
Apache License 2.0
3,084
2021-01-08T04:05:12
deep-learning;document-recognition;ocr;optical-character-recognition;pytorch;tensorflow2;text-detection;text-detection-recognition;text-recognition
python
{'merge_commit_hash': '79539fdd489e713308c3d567d7bcb4c5b0f80137', 'parents': ['056781a137a3d2973c638f62d7924cae431a608c', 'c681273e9c609b0a9892fcf5ab29c52bd3ffbb80'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['doctr/models/recognition/sar/pytorch.py']}
merge
medium
month
medium
179
meltano_meltano_merge_0000
meltano/meltano
main
MIT License
1,619
2021-06-21T04:35:39
connectors;data;data-engineering;data-pipelines;dataops;dataops-platform;elt;extract-data;integration;loaders;meltano;meltano-sdk;open-source;opensource;pipelines;singer;tap;taps;target;targets
python
{'merge_commit_hash': 'a0ec1510a657a47d9765f8bdec5f9647e3076586', 'parents': ['398bc585100cc8cc09285750046ea8d05b533e22', 'ce88a66dfaad37a45b7073729faed325c0a35bce'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/meltano/core/migration_service.py']}
merge
large
month
easy
180
mkdocs_mkdocs_merge_0000
mkdocs/mkdocs
master
BSD 2-Clause Simplified License
18,413
2014-01-11T09:05:21
documentation;markdown;mkdocs;python;static-site-generator
python
{'merge_commit_hash': '9394d4b168da096835564b3329ad37312c6bad8e', 'parents': ['4f98a94f14447e8872a6b7f7001470cf9dd293d4', '285461a3e7557a02b79d26839c629f276be79553'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['mkdocs/commands/build.py', 'mkdocs/theme.py']}
merge
medium
month
hard
181
schemathesis_schemathesis_merge_0001
schemathesis/schemathesis
master
MIT License
2,132
2019-08-19T11:13:01
cli;graphql;hacktoberfest;hypothesis;openapi;openapi3;property-based-testing;pytest;swagger;testing
python
{'merge_commit_hash': 'd16f13fa713e2cb71b6b4780970b593aa90e97a6', 'parents': ['d2023e711bdf7b9811bd8b156a7d27b66a0b6901', '02276c6b2e5a824a1e041ab59e17e81d56684610'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['src/schemathesis/specs/openapi/_cache.py', 'src/schemathesis/specs/openapi/schemas.py']}
merge
medium
month
hard
182
readthedocs_readthedocs_org_merge_0000
readthedocs/readthedocs.org
main
MIT License
7,881
2010-08-16T07:18:06
docs;mkdocs;python;sphinx;sphinx-doc
python
{'merge_commit_hash': '5d08d4eb3e876b7caf171cbcb0de392698902700', 'parents': ['102534ddeefdeafbfe9405b544fc7d373c0b9633', '052f891dbab6b21a5bbdf4570fb149a0adef1581'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['readthedocs/doc_builder/director.py']}
merge
large
month
medium
183
arc53_docsgpt_merge_0000
arc53/docsgpt
main
MIT License
14,194
2023-02-02T11:03:23
ai;gpt;hacktoberfest;hacktoberfest2023;natural-language-processing;python;react;web-app
python
{'merge_commit_hash': '794fc05adaf265061a0e68f4f52d7c507f57f21a', 'parents': ['5daeb7f876db9a69f64486f5ad77a418c03fe19d', '5e5e2b8aee879a254c957be2f7d5d10238ecc088'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['application/api/answer/routes.py']}
merge
medium
month
medium
184
google_flax_merge_0000
google/flax
main
Apache License 2.0
5,538
2020-01-10T09:48:37
jax
python
{'merge_commit_hash': '503fe76f9bfd76744353a506cfba7d9cb3a48af8', 'parents': ['df7ed78472fcc1a103950af4ddedeb7759c1e2d8', '1dc3d541daed141cbb91a7e31c0ddedcf2ce4927'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['examples/imagenet/train.py']}
merge
medium
month
medium
185
sktime_sktime_merge_0000
sktime/sktime
main
BSD 3-Clause New or Revised License
7,417
2018-11-06T03:08:24
data-mining;data-science;forecasting;hacktoberfest;machine-learning;scikit-learn;time-series;time-series-analysis;time-series-classification;time-series-regression
python
{'merge_commit_hash': '8b820435b9b99d2bf3545f1474f845463af6a247', 'parents': ['22bc7358c1f375fd6cfb8672b5256ff2def6cca9', 'f2284e2f338b3950d2e2c39ae67068e983d8296a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['sktime/classification/distance_based/_time_series_neighbors.py']}
merge
large
month
medium
186
holoviz_holoviews_merge_0000
holoviz/holoviews
main
BSD 3-Clause New or Revised License
2,636
2014-05-07T04:59:22
holoviews;holoviz;plotting
python
{'merge_commit_hash': 'e444a2c0e2327ec80d84861d859e872e6186350b', 'parents': ['de78cf33a10ba73e3dd9a30effca05862dfaa34f', '04aca3f4898721e50caf97c0f165f5415e2def49'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['holoviews/operation/datashader.py', 'tests/testdatashader.py']}
merge
large
month
hard
187
explosion_spacy_merge_0000
explosion/spacy
master
MIT License
28,907
2014-07-03T03:15:40
ai;artificial-intelligence;cython;data-science;deep-learning;entity-linking;machine-learning;named-entity-recognition;natural-language-processing;neural-network;neural-networks;nlp;nlp-library;python;spacy;text-classification;tokenization
python
{'merge_commit_hash': '63001848900db9490d75c8004dd6bf824ba44897', 'parents': ['d292c6fc7804677f058abd87a94baa5948519c77', 'cbc2ae933ee84c433d92ac3845e9520f761ee3c8'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['spacy/cli/init_pipeline.py']}
merge
large
month
easy
188
widgetti_solara_merge_0000
widgetti/solara
master
MIT License
1,596
2022-03-09T08:12:01
dataapp;fastapi;flask;ipywidgets;jupyter;starlette;webapp
python
{'merge_commit_hash': '0b447ae18b84e11895268ea4045aaf8bed2c2f66', 'parents': ['a52c339e7d0307a36db39faad26ba46764002555', 'd5ed2fb61763ddb9b216808f7fc2bcbdab687b1d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['solara/website/components/header.py']}
merge
medium
month
easy
189
openmined_pysyft_merge_0000
openmined/pysyft
dev
Apache License 2.0
9,266
2017-07-18T08:41:16
cryptography;deep-learning;federated-learning;hacktoberfest;privacy;python;pytorch;secure-computation;syft
python
{'merge_commit_hash': '04d5b6bee60d2889741567f2507b5dadead5e9ed', 'parents': ['78065bb327cc05bdb0c9a3960c82b5249ad61d04', '41f71dadbe0cb50efa27bf3f55ddf6578f7e70af'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['packages/syft/src/syft/util/notebook_ui/components/sync.py', 'packages/syft/src/syft/util/notebook_ui/notebook_addons.py']}
merge
medium
month
hard
198
coil_kt_coil_merge_0000
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': '5f50f2b1f8c232514b97e7d81c3356c896978c6b', 'parents': ['70d859870060b0d440808428e8e0b05227db3fbc', '12ded2c705422e392ea1c3d4e982a0820cc1edfe'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['coil-base/src/main/java/coil/memory/WeakMemoryCache.kt']}
merge
medium
week
easy
200
kivy_python_for_android_merge_0000
kivy/python-for-android
develop
MIT License
8,045
2011-11-28T09:02:36
android;apk;kivy;packaging;python
python
{'merge_commit_hash': '73a6ae8bb8e380e03ed35ace1b72535614b966e5', 'parents': ['726ddebb87086e7c035f0f23facfe4936754de2d', 'd1c44c77538ec35b08ad2e0992f4eb9794b5591f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['pythonforandroid/bootstraps/sdl2/build/build.py']}
merge
medium
month
medium
201
reflex_dev_reflex_merge_0000
reflex-dev/reflex
main
Apache License 2.0
16,831
2022-10-25T03:08:48
framework;gui;open-source;python;web
python
{'merge_commit_hash': '04211a32347f1d4c8cf2485f3cd6b1f4e26ef18a', 'parents': ['c5f1a2fca948e89f376f7c3b447313550b216423', 'e13ff71c2c9da6c0c629d6246e376bea761d57c0'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['reflex/app.py']}
merge
large
month
medium
203
zalando_patroni_merge_0000
zalando/patroni
master
MIT License
6,293
2015-07-08T09:27:19
consul;etcd;failover;haproxy;high-availability;kubernetes;postgresql;raft;zookeeper
python
{'merge_commit_hash': '46bc1ded8e0dc0734d71543b8a4225af2fde030f', 'parents': ['d3da80196ea52506a7cc2e955861974d42dc487d', '713244975c4c888f200c09ac25021e7ce743e067'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['patroni/ha.py', 'tests/test_ha.py']}
merge
medium
month
hard
204
yelp_paasta_merge_0000
yelp/paasta
master
Apache License 2.0
1,669
2015-10-26T09:35:53
docker;infrastructure;k8s;kubernetes;paas;paasta;yelp
python
{'merge_commit_hash': 'e1591c4acfac6ccba51489130c34f718ea8762bf', 'parents': ['86528d32f7f6ee11a34c387796bb95596d20d729', '989a18363d999e4e9c9374be76de4c2eaf2a09bd'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['paasta_tools/marathon_tools.py']}
merge
large
month
medium
205
dgtlmoon_changedetection_io_merge_0000
dgtlmoon/changedetection.io
master
Apache License 2.0
15,006
2021-01-27T04:03:30
back-in-stock;change-alert;change-detection;change-monitoring;changedetection;monitoring;notifications;restock-monitor;self-hosted;url-monitor;web-scraping;website-change-detection;website-change-detector;website-change-monitor;website-change-notification;website-change-tracker;website-defacement-monitoring;website-monitor;website-monitoring;website-watcher
python
{'merge_commit_hash': '74d4c580cfbe6d6c9bac22e924a3989e8b3b0434', 'parents': ['0df773a12c08f22af5e07f38c67c52ce3ad360c9', 'b899579ca8c42c254489ede9cc350a651cedb33e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['changedetectionio/notification.py']}
merge
medium
month
medium
206
onnx_onnx_merge_0000
onnx/onnx
main
Apache License 2.0
16,894
2017-09-07T04:53:45
deep-learning;deep-neural-networks;dnn;keras;machine-learning;ml;mxnet;neural-network;onnx;pytorch;scikit-learn;tensorflow
python
{'merge_commit_hash': '3de8f08b5c8566868129d69be22476c43ed04cd4', 'parents': ['09982c5569de294727b728c69852d5b40364097b', 'f083c76764aa95806160c2b07a6481f75c258178'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['onnx/test/parser_test.py']}
merge
large
month
easy
207
argilla_io_argilla_merge_0000
argilla-io/argilla
develop
Apache License 2.0
3,152
2021-04-28T02:37:42
active-learning;ai;annotation-tool;developer-tools;gpt-4;human-in-the-loop;langchain;llm;machine-learning;mlops;natural-language-processing;nlp;rlhf;text-annotation;text-labeling;weak-supervision;weakly-supervised-learning
python
{'merge_commit_hash': '9a981fc46621ab4419193f54fd27233b225e55fe', 'parents': ['962f340c4660026549d2fae2dfb1c4c68b0ad9e3', '70a9b2eb7aed1e458e724a828490ad87dd363064'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['argilla-server/src/argilla_server/api/webhooks/v1/enums.py', 'argilla-server/tests/unit/api/handlers/v1/webhooks/test_ping_webhook.py', 'argilla-server/tests/unit/api/webhooks/v1/test_notify_ping_event.py']}
merge
large
month
hard
208
gradio_app_gradio_merge_0000
gradio-app/gradio
main
Apache License 2.0
29,077
2018-12-19T08:24:04
data-analysis;data-science;data-visualization;deep-learning;deploy;gradio;gradio-interface;hacktoberfest;interface;machine-learning;models;python;python-notebook;ui;ui-components
python
{'merge_commit_hash': 'e508dd639785933a00af0626264d6b397b695182', 'parents': ['ea384210055da2b1e6a2919b9ee4f8f3e137fa81', '360350cfc46b7dcc41d8a015b7eb6e7056cc7938'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['gradio/blocks.py']}
merge
large
month
medium
210
ktorio_ktor_merge_0000
ktorio/ktor
main
Apache License 2.0
12,361
2015-08-03T04:49:36
async;asynchronous;kotlin;web;web-framework
kotlin
{'merge_commit_hash': '573f464b50142c8659f2b2d77b89a1cb9184e0c6', 'parents': ['cfe97550c66149e92944fb92757e6cacf6d4f2c3', '448f8749cd960b38fbddbca0f2fc2f596edf56fb'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['ktor-io/common/src/io/ktor/utils/io/charsets/Encoding.kt']}
merge
large
week
easy
211
jetbrains_ideavim_merge_0000
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': 'c268407ce34ef82bdbd0fda795c16249b9199fd0', 'parents': ['74b0e3bded0cf022ffc27484a177e597455b56e7', 'cd435c5f41dbfabced097235abf657c710ace1bb'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/com/maddyhome/idea/vim/listener/VimListenerManager.kt']}
merge
large
week
easy
218
kotlin_dokka_merge_0000
kotlin/dokka
master
Apache License 2.0
3,290
2014-07-12T09:15:22
api-reference;documentation;dokka;kotlin
kotlin
{'merge_commit_hash': '267b1bbfd8d8ce748d569fbc25a4422f649a9b15', 'parents': ['edaf8f30a3c2c127f924877b9a4c7c441c7b0c03', 'fb5816a62d1964db14aafd9420ff7fe857dd5333'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['dokka-runners/dokka-gradle-plugin/src/main/kotlin/internal/PluginFeaturesService.kt']}
merge
large
month
medium
219
kotlin_kotlinx_coroutines_merge_0000
kotlin/kotlinx.coroutines
master
Apache License 2.0
12,771
2016-06-22T01:49:21
async;coroutines;kotlin
kotlin
{'merge_commit_hash': '54b2ecd302890cf59a6c8de703bfcd0df30ed319', 'parents': ['515ccb10167d2a8703a445089f9d05e053790a96', '3c4168b6bde6e8dfb00f8f4d6a2c57b9126dbb83'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['common/kotlinx-coroutines-core-common/src/JobSupport.kt', 'core/kotlinx-coroutines-core/test/exceptions/SuppressionTests.kt']}
merge
medium
week
hard
220
modelscope_swift_merge_0000
modelscope/swift
main
Apache License 2.0
1,299
2023-08-01T03:06:39
agent;awq;deploy;dpo;finetune;galore;grok-1;lisa;llama;llama3;llava;llm;lora;modelscope;multimodal;pre-training;qwen;qwen-110b;sft;unsloth
python
{'merge_commit_hash': '3c79a9cafa5ab05f0cb844f370f221f0336f8571', 'parents': ['46bfe649957a941c4b9d2d1692cfabab702041a9', '31f89c3c589069efaf5e7f78bd3767aef38bcc6b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['swift/ui/llm_infer/runtime.py']}
merge
medium
month
medium
221
prefecthq_prefect_merge_0000
prefecthq/prefect
main
Apache License 2.0
14,724
2018-06-29T09:59:26
automation;data;data-engineering;data-ops;data-science;infrastructure;ml-ops;observability;orchestration;pipeline;prefect;python;workflow;workflow-engine
python
{'merge_commit_hash': '1fba690368a0cc127d14cadf2c832fc2567d2958', 'parents': ['0ad52dd1070597ed75582c43ef9c68b37b1dd7c5', '1460083a69ada901f0b60afbb8cac4c51bbceab8'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['scripts/generate_openapi_yml.py']}
merge
large
month
medium
223
getsentry_sentry_python_merge_0000
getsentry/sentry-python
master
MIT License
1,746
2018-06-18T10:51:10
crash-reporting;hacktoberfest;python;sentry;sentry-python;tag-production
python
{'merge_commit_hash': '0891703ecfd3c360aa59c94864435cd102078349', 'parents': ['0011e22bac179736fa6beacf96b0cba439a8d2bf', '4bec4a4729b64525ef55947fd4042e0d62ef72cc'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['sentry_sdk/_init_implementation.py', 'tests/test_api.py']}
merge
medium
month
hard
224
ray_project_ray_merge_0000
ray-project/ray
master
Apache License 2.0
31,210
2016-10-25T07:38:30
automl;data-science;deep-learning;deployment;distributed;hyperparameter-optimization;hyperparameter-search;java;llm-serving;machine-learning;model-selection;optimization;parallel;python;pytorch;ray;reinforcement-learning;rllib;serving;tensorflow
python
{'merge_commit_hash': '488b97f30e5f277133fe127b321a12b1947ffa57', 'parents': ['b10b3ef39ef4ef324d9183515dd13ef4c95188b1', 'f3f518c3b5a77b3e9c0b17d4f25e495e0c47c791'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['dashboard/modules/reporter/tests/test_reporter.py']}
merge
large
month
easy
225
huggingface_trl_merge_0000
huggingface/trl
main
Apache License 2.0
8,180
2020-03-27T10:54:55
unavailable
python
{'merge_commit_hash': '119779662d7b826359d683751d084bed5177e131', 'parents': ['26e31edade3156997430fea0e0db6d26d85461e8', 'ffe5f4f2cef6fd794cd58633a859276d8df15f20'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['tests/trainer/test_ppo_trainer.py']}
merge
medium
month
easy
226
aws_aws_sam_cli_merge_0000
aws/aws-sam-cli
develop
Apache License 2.0
6,444
2017-05-23T06:16:23
api-gateway;aws;docker;lambda;python;sam;serverless;serverlessapplicationmodel
python
{'merge_commit_hash': 'f97cd4e7fb9b78934df12521d906864e5337e17e', 'parents': ['f49df363018191a37d2ae45d6d56a4ec42ec3cb4', '24667d1f95a2ac225f554820aa2520366af42ba7'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 8, 'files_in_merge_conflict': ['samcli/commands/build/command.py', 'samcli/commands/init/__init__.py', 'samcli/lib/build/app_builder.py', 'samcli/lib/telemetry/metric.py', 'tests/integration/local/start_lambda/start_lambda_api_integ_base.py']}
merge
large
month
hard
227
nedbat_coveragepy_merge_0000
nedbat/coveragepy
master
Apache License 2.0
2,853
2018-06-23T05:44:53
unavailable
python
{'merge_commit_hash': '2d8116ef308f205df4b7091f93ae5930bdfe345b', 'parents': ['7a099a2204e6863824f11432c807442f3ad5306c', 'db8b6053fd7004d8ef041f6e6ac40c96ae7d17e3'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['tests/test_farm.py']}
merge
medium
month
easy
228
qiskit_qiskit_merge_0000
qiskit/qiskit
main
Apache License 2.0
4,641
2017-03-03T05:02:42
python;qiskit;quantum;quantum-circuit;quantum-computing;quantum-programming-language;sdk
python
{'merge_commit_hash': 'e4f0c59a85a718ffe5cdf32ca3d64ae26ebca907', 'parents': ['c23ab50c7b1c09310095e6eb44999b6739a2a452', '9e6a016dbd44fdeedf27241b9e02fbd8d4a617c8'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['qiskit/utils/__init__.py']}
merge
large
month
medium
229
nerfstudio_project_nerfstudio_merge_0000
nerfstudio-project/nerfstudio
main
Apache License 2.0
8,544
2022-05-31T06:17:37
3d;3d-graphics;3d-reconstruction;computer-vision;deep-learning;machine-learning;nerf;photogrammetry;pytorch
python
{'merge_commit_hash': '5b7c120bfd682e25e7a416947d3d71c11362675a', 'parents': ['280bf1bec37d1844b7ee4aaef11819c48604cffe', '899d9903875ac7bcf127780e9bda2d24183628fa'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['nerfactory/data/dataloader.py']}
merge
medium
month
easy
237
stripe_stripe_android_merge_0003
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
259
netflix_dgs_framework_merge_0001
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': 'cff938ffa85eacd912d25f8f53af9f847a049011', 'parents': ['db4f8cf782f7b6241125bfff1e683eafd29bef55', 'ecaa263ec734f12878264d4a875f7619eb9b2e3f'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['graphql-dgs-subscriptions-sse/src/main/kotlin/com/netflix/graphql/dgs/subscriptions/sse/DgsSSESubscriptionHandler.kt']}
merge
medium
week
easy
260
python_lsp_python_lsp_server_merge_0000
python-lsp/python-lsp-server
develop
MIT License
1,703
2021-02-21T09:21:42
unavailable
python
{'merge_commit_hash': '7554492a2b05257d722e45801a1d736d8788e7c0', 'parents': ['e1b6298b341bd1d789a0aad8b42f80b99996ce22', '91b5e4efe9db0d9d2cb1704c6132cf39cec780cd'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['pyls/plugins/__init__.py', 'pyls/plugins/pycodestyle_lint.py', 'pyls/python_ls.py', 'test/plugins/test_lint.py']}
merge
small
month
hard
261
pyro_ppl_pyro_merge_0000
pyro-ppl/pyro
dev
Apache License 2.0
8,394
2017-06-16T05:03:47
bayesian;bayesian-inference;deep-learning;machine-learning;probabilistic-modeling;probabilistic-programming;python;pytorch;variational-inference
python
{'merge_commit_hash': 'f0f1bf1f11e9d75b50a8b0044de38190184e0236', 'parents': ['118f39dbbaa7aca47dc590c0964b095052f54729', '347b286c263cd9761c92a69a7404adeebefbf3d1'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['pyro/distributions/util.py']}
merge
medium
month
medium
262
pimutils_khal_merge_0000
pimutils/khal
master
MIT License
2,503
2013-08-25T11:22:27
calendar;icalendar;python;terminal
python
{'merge_commit_hash': '94c0b4b89edd69c9d2631001580ae836958efa56', 'parents': ['fa7e4d5f07494b515c57e384a6b45cd09d50760f', '4d5f2eaa684106e882c13d6f996a47f49972daa4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['tests/datetimehelper_test.py']}
merge
medium
month
easy
263
run_llama_llama_index_merge_0000
run-llama/llama_index
main
MIT License
31,345
2022-11-02T04:24:54
agents;application;data;fine-tuning;framework;llamaindex;llm;rag;vector-database
python
{'merge_commit_hash': '3778f197d07d8253869c912f5e5c04438cbc82b3', 'parents': ['b193a7c4d42b9b19b93d962273325e8129c69375', 'f8dc93b715d8ed1da077063633b1624efe518068'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['llama_index/llm_predictor/base.py', 'setup.py']}
merge
huge
month
hard
264
netbox_community_netbox_merge_0000
netbox-community/netbox
develop
Apache License 2.0
15,000
2016-02-29T02:15:46
cabling;dcim;django;infrastructure-management;ipam;netbox;network;network-automation;python;sot;sysadmin
python
{'merge_commit_hash': '21ca8d7d6d267b755ddd69f26e6dfc447ab279b6', 'parents': ['5ab633120b942d764a5a0b118c479bce97fd416c', 'b83fcc6077bd9d980c1f2164e32015454429279e'], 'number_of_files_with_merge_conflict': 7, 'total_number_of_merge_conflicts': 7, 'files_in_merge_conflict': ['netbox/ipam/api/serializers.py', 'netbox/ipam/filtersets.py', 'netbox/ipam/forms/model_forms.py', 'netbox/ipam/tests/test_api.py', 'netbox/ipam/tests/test_filtersets.py', 'netbox/ipam/tests/test_models.py', 'netbox/vpn/models/l2vpn.py']}
merge
large
month
hard
265
explosion_spacy_merge_0001
explosion/spacy
master
MIT License
28,907
2014-07-03T03:15:40
ai;artificial-intelligence;cython;data-science;deep-learning;entity-linking;machine-learning;named-entity-recognition;natural-language-processing;neural-network;neural-networks;nlp;nlp-library;python;spacy;text-classification;tokenization
python
{'merge_commit_hash': '610dfd85c23ca155f1c57f4e17325a4cc4d6c298', 'parents': ['9b3ba4071a3c2b3e777324fc03d298f343241bf5', 'b032943c34fd79a724ca87cb289efd5972f30b28'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['spacy/cli/train.py']}
merge
large
month
medium
266
lektor_lektor_merge_0000
lektor/lektor
master
BSD 3-Clause New or Revised License
3,776
2015-12-19T09:18:36
cms;static-site-generator
python
{'merge_commit_hash': '03c2101c40828abe0f94e76112a5741bd20b3e0b', 'parents': ['ea03689c3e7d214eefc2f4762b69cdaf02b30e63', '164c32ef3a9bdf50efd08149304948a5b11d6fff'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['lektor/db.py', 'tests/test_db.py']}
merge
medium
month
hard
267
openvinotoolkit_training_extensions_merge_0000
openvinotoolkit/training_extensions
develop
Apache License 2.0
1,122
2018-10-26T02:02:29
action-recognition;anomaly-detection;automl;computer-vision;datumaro;deep-learning;hyper-parameter-optimization;image-classification;image-segmentation;incremental-learning;machine-learning;neural-networks-compression;object-detection;openvino;pytorch;quantization;self-supervised-learning;semi-supervised-learning;transfer-learning
python
{'merge_commit_hash': '0e1d16445da4eac10edb3c094aa8d81b396ac84f', 'parents': ['a0159389035c7dd87270d9392496a11aeddc3079', 'f6a17f30d616376cd0a36d3b98e15277878d215e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/otx/__init__.py']}
merge
medium
month
easy
268
gitpython_developers_gitpython_merge_0000
gitpython-developers/gitpython
main
BSD 3-Clause New or Revised License
4,435
2010-11-30T05:34:03
git-plumbing;git-porcelain;python-library
python
{'merge_commit_hash': 'd255f4c8fd905d1cd12bd42b542953d54ac8a8c3', 'parents': ['b4492c7965cd8e3c5faaf28b2a6414b04984720b', 'c5077dac4c7680c925f4c5e792eeb3c296a3b4c4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['git/remote.py']}
merge
medium
month
medium
269
pyro_ppl_numpyro_merge_0000
pyro-ppl/numpyro
master
Apache License 2.0
2,062
2019-02-13T09:13:59
bayesian-inference;hmc;inference-algorithms;jax;mcmc;numpy;probabilistic-programming;pyro
python
{'merge_commit_hash': '23cea351511e4b04862889ea55ba94c706203754', 'parents': ['40a8916d14492256f5216fed9e595af53d0f78ca', '16c1f5ce2c5cfb4df00996812c8ff82e69683aae'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['numpyro/infer/util.py']}
merge
medium
month
easy
276
foso_ktorfit_merge_0000
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
283
getkeops_keops_merge_0000
getkeops/keops
main
MIT License
1,007
2019-04-18T09:04:07
unavailable
python
{'merge_commit_hash': '64663cde68e639a57caaf2081a910ced61045611', 'parents': ['339d4ec4a17d7e3b1a191916e5d9f42b9d95f008', '9ad5bea3986fdcdebdcfcb850c34edcbf84e7cde'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['pykeops/tutorials/kmeans/plot_kmeans_torch.py']}
merge
medium
month
medium
284
huggingface_pytorch_image_models_merge_0000
huggingface/pytorch-image-models
main
Apache License 2.0
29,866
2019-02-02T05:51:12
augmix;convnext;distributed-training;dual-path-networks;efficientnet;image-classification;imagenet;maxvit;mixnet;mobile-deep-learning;mobilenet-v2;mobilenetv3;nfnets;normalization-free-training;pretrained-models;pretrained-weights;pytorch;randaugment;resnet;vision-transformer-models
python
{'merge_commit_hash': '87bfb055c062bdbccc1a44d71ba5aca6eeb5518e', 'parents': ['f07dfe010ac31c5c2189fad2831ce089366c1d80', 'c45c6ee8e406861898acccb1818f91d0c9240e48'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['train.py', 'validate.py']}
merge
large
month
hard
285
octodns_octodns_merge_0000
octodns/octodns
main
MIT License
2,992
2017-03-14T05:18:47
dns;infrastructure-as-code;workflow
python
{'merge_commit_hash': 'b4792707f8b4c2105d062236dfb33785a28414b6', 'parents': ['cda6ef39090cac7455f428132d3d611501968442', '51b45e5911b47673ea9e0de78afbf08579a4bf4d'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['octodns/manager.py', 'tests/test_octodns_provider_yaml.py']}
merge
medium
month
hard
286
getsentry_sentry_python_merge_0001
getsentry/sentry-python
master
MIT License
1,746
2018-06-18T10:51:10
crash-reporting;hacktoberfest;python;sentry;sentry-python;tag-production
python
{'merge_commit_hash': '97bf513922d4003b7ed8c13b43633f18a122eb29', 'parents': ['a4bc9decd63f468b0b7614001e7a3d3fc5b8b530', 'e6ca5a28dd139097ad7c8cb468e0b9232185b728'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['sentry_sdk/tracing.py']}
merge
medium
month
medium
287
vllm_project_vllm_merge_0000
vllm-project/vllm
main
Apache License 2.0
18,939
2023-02-09T11:23:20
amd;cuda;gpt;inference;inferentia;llama;llm;llm-serving;llmops;mlops;model-serving;pytorch;rocm;trainium;transformer
python
{'merge_commit_hash': '11cf82f172f04a2d3c8d8da69fdf76e242862966', 'parents': ['0695f77c216715472a7b9f016072f0bcf30c9b69', '8e1cddcd44da6bc58d4201e2a388ed9afd5adfb8'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['vllm/model_executor/utils.py']}
merge
medium
month
easy
289
google_timesketch_merge_0001
google/timesketch
master
Apache License 2.0
2,505
2014-06-19T05:49:45
analysis;dfir;forensics;security;timeline
python
{'merge_commit_hash': 'dfcf64010cb3347fad910e257c46084c6bf4d200', 'parents': ['bb8c28fa1aef315b4a14850436cd2dd8eb1c3006', '2df442654f351ff0c65ef89c37a09b56ca57e705'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['cli_client/python/timesketch_cli_client/cli.py', 'cli_client/python/timesketch_cli_client/commands/search.py']}
merge
medium
month
hard
291
element_hq_element_android_merge_0005
element-hq/element-android
develop
Apache License 2.0
3,239
2018-10-02T03:56:15
element-android;hacktoberfest;matrix
kotlin
{'merge_commit_hash': 'cc94b6cf7d55c4a675965844644a3da7406fbcda', 'parents': ['614127e46bb685268a894691c15c67a80e0e2105', 'a8e19f3cc94ba9c6787e1b4d0e8f9078335c3f3e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt']}
merge
large
week
easy
293
element_hq_element_android_merge_0007
element-hq/element-android
develop
Apache License 2.0
3,239
2018-10-02T03:56:15
element-android;hacktoberfest;matrix
kotlin
{'merge_commit_hash': 'f6acd3b18192d53a6852360df4c0782444d12809', 'parents': ['3457a8378404b108bfd96cc39d623d8678b9aaa2', '60004f02c3914b01bb23c7978d9ae61fb20f5852'], '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/failure/MatrixError.kt']}
merge
large
week
easy
298
element_hq_element_android_merge_0012
element-hq/element-android
develop
Apache License 2.0
3,239
2018-10-02T03:56:15
element-android;hacktoberfest;matrix
kotlin
{'merge_commit_hash': 'c290dd6c1dcbfb1319d790ec608093b77c1ecde2', 'parents': ['7d8590d85f75ca9d66acaaea2bf8277c7a6ff903', '462d3071de72c1abf99f8f401a007505bb2f196e'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt', 'vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt', 'vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt', 'vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt']}
merge
large
week
hard
299
element_hq_element_android_merge_0013
element-hq/element-android
develop
Apache License 2.0
3,239
2018-10-02T03:56:15
element-android;hacktoberfest;matrix
kotlin
{'merge_commit_hash': 'edfe81cc2b9e56d7ea08d36844af234fdc89f97f', 'parents': ['7449d15d2f6119704f8ab7d234432113d635c39d', '84b34f75deac7f4bd0e15266e0c0ed6afb33045e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt']}
merge
large
week
medium
301
kotlin_kotlinx_coroutines_merge_0003
kotlin/kotlinx.coroutines
master
Apache License 2.0
12,771
2016-06-22T01:49:21
async;coroutines;kotlin
kotlin
{'merge_commit_hash': '3ac73f644e3f1e0ce72c344ee1d2745ced07a375', 'parents': ['e50fb89c4e80d7accb9bdfff3ce54c59d2857c26', '7f2ed2f8ee1e3ec02f263f4b0eb608088bee94c1'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['core/kotlinx-coroutines-core/src/CommonPool.kt', 'core/kotlinx-coroutines-core/test/TestBase.kt']}
merge
medium
week
hard
303
element_hq_element_android_merge_0014
element-hq/element-android
develop
Apache License 2.0
3,239
2018-10-02T03:56:15
element-android;hacktoberfest;matrix
kotlin
{'merge_commit_hash': 'd5432cd0e7b657e957af865972307128b7221d2e', 'parents': ['927f526c6cba44447a4ac53682303697a8ea4c94', '0675b7c16c45d982378ddbbc7a2b5d16423cfedc'], '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/onboarding/DirectLoginUseCase.kt']}
merge
large
week
easy
305
corda_corda_merge_0000
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': '194d50071b67c3985bd1d6ec3f2f0cdca241923a', 'parents': ['5552044ddb7dc49c62e958d67ffb3a0a349fa471', '844b33ee94d44983410f2de4f0eabaf40956cac8'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['core/src/main/kotlin/net/corda/core/contracts/AttachmentConstraint.kt']}
merge
large
month
easy
306
element_hq_element_android_merge_0015
element-hq/element-android
develop
Apache License 2.0
3,239
2018-10-02T03:56:15
element-android;hacktoberfest;matrix
kotlin
{'merge_commit_hash': '067c485e4f776318f96af6afb39d7fad4398b251', 'parents': ['e1ceb227c687dd5a62422233afe30e3aeacb17e8', '8a68b31f1b86127f610b5050f9dfa388c67b601e'], '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/HomeDetailViewModel.kt']}
merge
large
week
easy
307
jetbrains_exposed_merge_0000
jetbrains/exposed
main
Apache License 2.0
7,963
2013-07-30T12:55:27
dao;kotlin;orm;sql
kotlin
{'merge_commit_hash': '7b7ab12251b9afeb4f8cbdf252e8816e8962c23d', 'parents': ['68d7ab430589c432f38cacfb8f86c4ab33a206e8', '2f6ce9c40b282a3b1f907ceaedd07e52991f849a'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['buildSrc/src/main/kotlin/org/jetbrains/exposed/gradle/Versions.kt', 'exposed-tests/src/main/kotlin/org/jetbrains/exposed/sql/tests/DatabaseTestsBase.kt', 'exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DDLTests.kt', 'exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/ddl/CreateTableTests.kt']}
merge
medium
week
hard
309
stripe_stripe_android_merge_0009
stripe/stripe-android
master
MIT License
1,226
2012-11-29T06:11:30
stripe;stripe-sdk
kotlin
{'merge_commit_hash': 'c9df5e9a256fa0cc607d51309ccb54d63229c735', 'parents': ['81dd53c16bba9fa2681fcd061f24eda415a3b1a0', 'a4ab64191460ab157eab5403733c89c61e2ef030'], '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/forms/resources/LpmRepository.kt']}
merge
huge
week
easy
311
microsoft_promptflow_merge_0000
microsoft/promptflow
main
MIT License
8,207
2023-06-30T06:03:06
ai;ai-application-development;ai-applications;chatgpt;gpt;llm;prompt;prompt-engineering
python
{'merge_commit_hash': 'b6d19d2bff77c5b223effe7d50450dac08b0f9a9', 'parents': ['5541a38974419ebe8f47595ffe3e5717125f1cb4', '2c28c92196c7693cfe56f1b4a16dd97ab435b985'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/promptflow/promptflow/_constants.py']}
merge
large
month
easy
312
aws_aws_sdk_pandas_merge_0000
aws/aws-sdk-pandas
main
Apache License 2.0
3,805
2019-02-26T01:39:02
amazon-athena;amazon-sagemaker-notebook;apache-arrow;apache-parquet;athena;aws;aws-glue;aws-lambda;data-engineering;data-science;emr;etl;glue-catalog;lambda;modin;mysql;pandas;python;ray;redshift
python
{'merge_commit_hash': '9caa1e2efa2636f74e37c23269b32b9d2fab11a4', 'parents': ['589c114a92a2ce0d44cfd19955fa919483314abf', 'fb1d2282c958a9fddde66497d8246b444ec47a04'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['awswrangler/timestream.py', 'tests/unit/test_timestream.py']}
merge
medium
month
hard
314
milescranmer_pysr_merge_0000
milescranmer/pysr
master
Apache License 2.0
1,983
2020-09-14T11:16:09
algorithm;automl;data-science;distributed-systems;equation-discovery;evolutionary-algorithms;explainable-ai;genetic-algorithm;interpretable-ml;julia;machine-learning;numpy;python;scikit-learn;symbolic;symbolic-regression
python
{'merge_commit_hash': '0dbee977f4b5f7989bedf4484ef97fd3707b7d41', 'parents': ['3ef2b3247449eec2a1e19e59f2f8531787a1fb43', '35e6ab195b69d15cf3855a5f8edac6d3a4122543'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['test/test.py']}
merge
small
month
medium
316
moj_analytical_services_splink_merge_0000
moj-analytical-services/splink
master
MIT License
1,110
2019-11-22T02:27:33
data-matching;data-science;deduplicate-data;deduplication;duckdb;em-algorithm;entity-resolution;fuzzy-matching;record-linkage;spark;uk-gov-data-science
python
{'merge_commit_hash': 'd2366f94bf56facdcfb0ed10704fbe7b08d72522', 'parents': ['635c49ac19e67c50c1f7943a4884f03d7d2bad4d', '10c0511824762e2abbdada2e84f5d1db39ae9436'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['splink/profile_data.py', 'splink/splink_dataframe.py']}
merge
large
month
hard