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 |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
85 |
conan_io_conan_merge_0056
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '06cab31d4c58e52947aebc3ad310dde6e3a19fde', 'parents': ['0eb405bde999d5b7b8e706b206940d2e24aa828e', 'ba8c97fca2f15705aabb47bb15f9639b7fba5deb'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
|
merge
|
medium
|
month
|
hard
|
86 |
conan_io_conan_merge_0057
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'fe4d2a7a9f6e11f38632ae5f79d9e98f33d26871', 'parents': ['ee1c7c4394fed198e20bd7a7d27bc289f99e7eda', '5d05d770e9f7e097c6ed9c9fd390fb81887e68c4'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
87 |
conan_io_conan_merge_0058
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'ee1c7c4394fed198e20bd7a7d27bc289f99e7eda', 'parents': ['f4d49d5ec4c2b05ab7fe8f16633c52bd02066e9b', '226dcdbb839049d6fd2cd3149b228addb7303110'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
88 |
conan_io_conan_merge_0059
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'f4d49d5ec4c2b05ab7fe8f16633c52bd02066e9b', 'parents': ['3e890ba3cf8cd25e97f7124d3b48681ea7050f98', '99a11fca7520bccdde92e99f606cc310b36792c1'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
89 |
conan_io_conan_merge_0060
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '1b8028aa63712c8bb58e5cb6b7dd029cf1ac08f9', 'parents': ['326440c709b87b63977a73d880a80c0ddc4b8042', '7b004e4dc5477f5d27f8a267a3ff4e5dfd482187'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['conan/tools/cmake/cmake.py', 'conans/test/functional/layout/test_local_commands.py']}
|
merge
|
medium
|
month
|
hard
|
90 |
conan_io_conan_merge_0061
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '9b8e3f6407201741f0734ddfaf28d2a191db1c16', 'parents': ['de60bcec9eee63b8c82298defd721f63f2013517', '81ac7d7905897c1487404f5431e48f3172822fe6'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
91 |
conan_io_conan_merge_0062
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '35a5240f0d72040973f22183932aaadfd6d47f57', 'parents': ['058719901e507636db4db9117e49d426a6437abb', '6ebea89bd1ea05cce7b0213f2cd067f9f666effa'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conan/tools/files/files.py']}
|
merge
|
medium
|
month
|
easy
|
92 |
conan_io_conan_merge_0063
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '78943e66544f71908217ff7ee3c7009b9184adb9', 'parents': ['0923e785696dd920706dd1f8f05995b590e7fcd6', '51a077458b697dcd39e5eb64f1d33a6c52584081'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/client/conf/detect.py']}
|
merge
|
medium
|
month
|
easy
|
93 |
conan_io_conan_merge_0064
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '1c5b458a324740fc273be40e986d2b65a7f50307', 'parents': ['25c22dbcd3537c71d793fa036725060a19a14f10', '56aad3ae51cc1cc53ae5d1b697714ea72072febb'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['conans/test/unittests/tools/files/test_patches.py']}
|
merge
|
medium
|
month
|
medium
|
94 |
conan_io_conan_merge_0065
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'd7e76eda074b9d18fbee537ed7d8a4c8c2dca51e', 'parents': ['24cc85b5d55d4e08aca8ba15199bbb3a889bc321', '3c3a718d8c66d55c3d9858c43bec7492134f6c34'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['conan/tools/files/files.py', 'conans/client/cache/cache.py', 'conans/model/conf.py']}
|
merge
|
medium
|
month
|
hard
|
95 |
conan_io_conan_merge_0066
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '24cc85b5d55d4e08aca8ba15199bbb3a889bc321', 'parents': ['e6b6f9177dfb5f8e5edfde1f8e097881319ba0ca', '2dc20934ba635abc53ba0c7a2fe8a24011e843b1'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['conan/tools/cmake/toolchain/blocks.py', 'conans/client/installer.py', 'conans/model/conan_file.py', 'conans/test/integration/command/install/install_test.py']}
|
merge
|
medium
|
month
|
hard
|
96 |
conan_io_conan_merge_0067
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'e6b6f9177dfb5f8e5edfde1f8e097881319ba0ca', 'parents': ['09511a4565c31a57d68154baae506f5ee245d234', 'a3023ff659a67f5a6969e29b9231e0a48fa33ada'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['conan/tools/cmake/toolchain/blocks.py', 'conans/test/functional/toolchains/cmake/test_cmake_toolchain_m1.py', 'conans/test/functional/toolchains/gnu/autotools/test_basic.py', 'conans/test/integration/toolchains/cmake/test_cmaketoolchain.py']}
|
merge
|
medium
|
month
|
hard
|
97 |
conan_io_conan_merge_0068
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '742112bb6eccee1508e1d523f37485aa9b84d019', 'parents': ['7f6e8471097a23387ae9c9a6826568f7bdd9278c', 'e4d807c0a563c988cc93757f334b5e769db346cf'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['conans/client/command.py', 'conans/client/tools/system_pm.py', 'conans/test/unittests/client/tools/system_pm_test.py']}
|
merge
|
medium
|
month
|
hard
|
98 |
conan_io_conan_merge_0069
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'd018052b4a1221307e802995c5f319d5be8752c6', 'parents': ['d139cc5f635486f53f2add35509094c14a320dc3', '0f98c1e915ebeb25fafd3bd4ad247cef3efdc16f'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['conans/client/remote_manager.py', 'conans/model/conf.py', 'conans/test/assets/pkg_cmake.py', 'conans/test/functional/toolchains/cmake/cmakedeps/test_weird_library_names.py']}
|
merge
|
medium
|
month
|
hard
|
99 |
conan_io_conan_merge_0070
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'b7243c4ec36917cfb7b5f4e305d7e6d8e2555ffa', 'parents': ['b86e6a0394eee39223472cf06a18fe537d2299ec', '4238de0bff26e30d29e8870dcb98da85ae910d72'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
100 |
conan_io_conan_merge_0071
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'edb3a4a1f7739027c0665749b82b1cc473453ab6', 'parents': ['bbfa3df2c402001fb90e1e1725fc4bdd36de262a', '69d3ecaf3729be362dc286ca448bbbc39a2164f2'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
|
merge
|
medium
|
month
|
hard
|
101 |
conan_io_conan_merge_0072
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '58dd8268d94f27f49a50b4f155c45c1c05476d44', 'parents': ['8ece0c03c661cc7bd2528fd20351e74f2156a177', '9c844d86d81c8ae1ba338c78171de38dab2d0a95'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
|
merge
|
medium
|
month
|
hard
|
102 |
conan_io_conan_merge_0073
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '201480146740d2ab298b9f360037ab9e56c2a6a5', 'parents': ['315f355f8924f64206a67d980ec635287fbd2a9c', 'b7e147a4a0d84723a10572fb6925bd770d6c7e54'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
|
merge
|
medium
|
month
|
hard
|
103 |
conan_io_conan_merge_0074
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '7f03c1d340eedcf9772722361a42dfb4ba2fc81e', 'parents': ['bbfb6b5ddfd2beadeffc3f4b262faec4373f2b50', '172dd3999a998d58a80a85d21091cafc2b94961a'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
|
merge
|
medium
|
month
|
hard
|
104 |
conan_io_conan_merge_0075
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'f4229764a9c18dc524e360e07af97279713dd9be', 'parents': ['c8d20bb53cc532db05544b3b2f12e42dc2921afd', 'f322a7438c196824c60efa951c9ffd4d96edfc71'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
105 |
conan_io_conan_merge_0076
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '40fec5a0a460cb722ab90ec6622571be81792ca0', 'parents': ['d83046a4faa2789817f8136a6d088bf524d0e50d', 'e856ed56f64871e9d6c2889886e764bd3efafa63'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
|
merge
|
medium
|
month
|
hard
|
106 |
conan_io_conan_merge_0077
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '10e7d5b1e534cc665fa4c403cb560e5de20364d6', 'parents': ['1a596c8e18d71471e351fc17631480a2f27fdb04', '134c0166b33125e661896380c5bf3fee3c353d66'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
|
merge
|
medium
|
month
|
hard
|
107 |
conan_io_conan_merge_0078
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '044994f0b9e053e81642b909d1146756a7bc2826', 'parents': ['8653d137022aaacaf3c9c27c8bf287532db368f5', '5c09f3ec15c4f5e69b131ea0c99196780a28e29b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
108 |
conan_io_conan_merge_0079
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'e1266058addc8b76127cef8165ddda25ceaeb485', 'parents': ['a866f48d669f0e5e10a4dc75a2cfa32aa85fb6d7', '210df983a0596aa30e45913cccfa78f73a48704e'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
|
merge
|
medium
|
month
|
hard
|
109 |
reactor_reactor_netty_merge_0001
|
reactor/reactor-netty
|
main
|
Apache License 2.0
| 2,515 |
2016-08-18T08:58:56
|
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
|
java
|
{'merge_commit_hash': '77b2cc4f27b20f0d2b99705870d9f8d983a09bbb', 'parents': ['16a05cc38b30e22176eac12d829377501ae5d603', 'bae8fd072017ff81a83e6897b7869c87a6f6261c'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/reactor/netty/http/server/HttpServerOperations.java']}
|
merge
|
medium
|
month
|
easy
|
110 |
reactor_reactor_netty_merge_0002
|
reactor/reactor-netty
|
main
|
Apache License 2.0
| 2,515 |
2016-08-18T08:58:56
|
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
|
java
|
{'merge_commit_hash': 'feac090f74ef1562d6251d3deb0ec58038743c57', 'parents': ['06ca89ba7755e353100d6a9931d49f93bf285669', '87274300889601d01d3a6870241282ca720d2b93'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/test/java/reactor/netty/http/client/HttpClientTest.java']}
|
merge
|
medium
|
month
|
medium
|
111 |
reactor_reactor_netty_merge_0003
|
reactor/reactor-netty
|
main
|
Apache License 2.0
| 2,515 |
2016-08-18T08:58:56
|
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
|
java
|
{'merge_commit_hash': '30996636548523a130adca427a7107d178f76e48', 'parents': ['cd56012272d4302956cbfe1acd62a25a853f0a59', '39accc178641d4bc2ba1e1a83027de8ee4bbfba0'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['src/main/java/reactor/netty/http/client/HttpClientOperations.java', 'src/test/java/reactor/netty/resources/PooledConnectionProviderTest.java']}
|
merge
|
medium
|
month
|
hard
|
112 |
reactor_reactor_netty_merge_0004
|
reactor/reactor-netty
|
main
|
Apache License 2.0
| 2,515 |
2016-08-18T08:58:56
|
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
|
java
|
{'merge_commit_hash': 'cd56012272d4302956cbfe1acd62a25a853f0a59', 'parents': ['f0b0bc770d1da9876e81ce49e94471566ffc3f25', 'c6e8e08a6279eee4ac86147df5952a4b2901efdb'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['src/test/java/reactor/netty/http/client/HttpRedirectTest.java']}
|
merge
|
medium
|
month
|
medium
|
113 |
reactor_reactor_netty_merge_0005
|
reactor/reactor-netty
|
main
|
Apache License 2.0
| 2,515 |
2016-08-18T08:58:56
|
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
|
java
|
{'merge_commit_hash': 'a462aad07f0bfd00f3f636c847cacb05655f1b12', 'parents': ['9e4423b6751477bd82aacaecfe81ff983473c216', 'bdd365474fe7b1453eb46bd86824d4e113616752'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['src/test/java/reactor/netty/resources/PooledConnectionProviderTest.java']}
|
merge
|
medium
|
month
|
medium
|
114 |
reactor_reactor_netty_merge_0006
|
reactor/reactor-netty
|
main
|
Apache License 2.0
| 2,515 |
2016-08-18T08:58:56
|
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
|
java
|
{'merge_commit_hash': '9e4423b6751477bd82aacaecfe81ff983473c216', 'parents': ['aa4eb3083250d00cdf793c016c0757362968efda', 'ad229344d91f0a499345bdbcc53f0304585d18e2'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/test/java/reactor/netty/resources/PooledConnectionProviderTest.java']}
|
merge
|
medium
|
month
|
easy
|
115 |
reactor_reactor_netty_merge_0007
|
reactor/reactor-netty
|
main
|
Apache License 2.0
| 2,515 |
2016-08-18T08:58:56
|
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
|
java
|
{'merge_commit_hash': '4eb8ae8acfc3e0b7485b09a7853987fe2e4c9237', 'parents': ['a6e8122b1ef274cd0e6d80c42dd336132d664227', 'cb5d15db0ad6ee5a1674d4bdee64f7242e2e21e9'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['src/test/java/reactor/netty/http/client/HttpClientTest.java']}
|
merge
|
medium
|
month
|
medium
|
116 |
reactor_reactor_netty_merge_0008
|
reactor/reactor-netty
|
main
|
Apache License 2.0
| 2,515 |
2016-08-18T08:58:56
|
flux;http;ipc;mono;netty;quic;reactive;reactive-streams;reactor;reactor3;tcp;udp
|
java
|
{'merge_commit_hash': '303f3bb73d8e6ff0d3c9326f0ba9b8448f42b2cf', 'parents': ['c88a5f5206fd193e187261e0652db1aa5c7fc740', 'dfb71cf9f20d46754c7166690d4ca7de4ef3ad8e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['src/main/java/reactor/netty/http/HttpOperations.java']}
|
merge
|
medium
|
month
|
easy
|
118 |
tinygrad_tinygrad_merge_0002
|
tinygrad/tinygrad
|
master
|
MIT License
| 24,078 |
2020-10-18T04:23:12
|
not available
|
python
|
{'merge_commit_hash': '3d4cde8846ca707ec4e343310adac6c24c22b0dd', 'parents': ['525d75e1c7dc25671c9292687ba290389f7968b0', 'a17ea53340d4430b7df3ceda2f6405357af3ff8e'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['tinygrad/codegen/lowerer.py', 'tinygrad/ops.py']}
|
merge
|
large
|
month
|
hard
|
119 |
yelp_detect_secrets_merge_0000
|
yelp/detect-secrets
|
master
|
Apache License 2.0
| 3,478 |
2017-12-05T12:38:38
|
not available
|
python
|
{'merge_commit_hash': 'ceefaaa67fde32bc999a207447f594586fbc8f4d', 'parents': ['ba4abd0fdc6400ba8eba89bc0df1408cd6035649', '569cd8824c477a6d23cf20a8e69e99f33b24413f'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['detect_secrets/audit/common.py', 'detect_secrets/core/scan.py']}
|
merge
|
medium
|
month
|
hard
|
120 |
yelp_detect_secrets_merge_0001
|
yelp/detect-secrets
|
master
|
Apache License 2.0
| 3,478 |
2017-12-05T12:38:38
|
not available
|
python
|
{'merge_commit_hash': '5565e8079e760f5553b954e7940bbf235a447fdd', 'parents': ['c929b6a343e0403372475af669d04cf43a848c8d', 'a13f7d409120871cb9e220580151fce80609e1c2'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['setup.py']}
|
merge
|
medium
|
month
|
easy
|
121 |
yelp_detect_secrets_merge_0002
|
yelp/detect-secrets
|
master
|
Apache License 2.0
| 3,478 |
2017-12-05T12:38:38
|
not available
|
python
|
{'merge_commit_hash': 'f8fbf834f37ddabd1606534172110ca6adacfbe6', 'parents': ['e819add5fe2b95ca8952b14e2ed5bcb9e39c982f', 'c86ca850a20da6169a21aa5c15774755305683a6'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['detect_secrets/filters/heuristic.py', 'detect_secrets/settings.py', 'tests/filters/heuristic_filter_test.py']}
|
merge
|
medium
|
month
|
hard
|
122 |
yelp_detect_secrets_merge_0003
|
yelp/detect-secrets
|
master
|
Apache License 2.0
| 3,478 |
2017-12-05T12:38:38
|
not available
|
python
|
{'merge_commit_hash': 'ee60f969842d1847a94d9f4edfe168c5dc029d4f', 'parents': ['eee4649aff8727b28c900789809fdfe62d362b93', '5ffc17d91e5910abd0c564cf43a4c11fb24915d9'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['detect_secrets/plugins/keyword.py']}
|
merge
|
medium
|
month
|
easy
|
123 |
yelp_detect_secrets_merge_0004
|
yelp/detect-secrets
|
master
|
Apache License 2.0
| 3,478 |
2017-12-05T12:38:38
|
not available
|
python
|
{'merge_commit_hash': '242046b99c75c43e4c7c25bbb66b1e6f82bc9643', 'parents': ['d1f8f1112e6ff922eedb3b5d4687871ba9ee6ffc', 'e61b9f988ce43abbe49aafa43d819fa88596a346'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['detect_secrets/plugins/base.py', 'tests/audit/analytics_test.py', 'tests/core/baseline_test.py']}
|
merge
|
medium
|
month
|
hard
|
124 |
yelp_detect_secrets_merge_0005
|
yelp/detect-secrets
|
master
|
Apache License 2.0
| 3,478 |
2017-12-05T12:38:38
|
not available
|
python
|
{'merge_commit_hash': 'cf8fc45e23ea11942191ba33a976ecca2ccc398d', 'parents': ['2e390125606a5d45a0a31435c51cefb9a3d8956b', '3f2b47bf0eb88e3dd987d16d157d004c711fe135'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['detect_secrets/core/usage/filters.py', 'tests/core/usage/filters_usage_test.py']}
|
merge
|
medium
|
month
|
hard
|
125 |
yelp_detect_secrets_merge_0006
|
yelp/detect-secrets
|
master
|
Apache License 2.0
| 3,478 |
2017-12-05T12:38:38
|
not available
|
python
|
{'merge_commit_hash': 'cf8fc45e23ea11942191ba33a976ecca2ccc398d', 'parents': ['2e390125606a5d45a0a31435c51cefb9a3d8956b', '3f2b47bf0eb88e3dd987d16d157d004c711fe135'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['detect_secrets/core/usage/filters.py', 'tests/core/usage/filters_usage_test.py']}
|
merge
|
medium
|
month
|
hard
|
126 |
yelp_detect_secrets_merge_0007
|
yelp/detect-secrets
|
master
|
Apache License 2.0
| 3,478 |
2017-12-05T12:38:38
|
not available
|
python
|
{'merge_commit_hash': 'da17012b93330e1c4a1de0b417c3ca219fccb536', 'parents': ['15a3ef53c7d3ab356a26e226e9fffe10d93c8474', 'fc9a0305dfd801fb64a37d2cf275d5bfb0ffe7e6'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['detect_secrets/core/usage/plugins.py', 'tests/main_test.py']}
|
merge
|
medium
|
month
|
hard
|
127 |
yelp_detect_secrets_merge_0008
|
yelp/detect-secrets
|
master
|
Apache License 2.0
| 3,478 |
2017-12-05T12:38:38
|
not available
|
python
|
{'merge_commit_hash': '82c7b1d6b21c171aba598fe19138bbbf3518c9df', 'parents': ['2a063928161298cb5db8792de327c8c9d892ae92', 'cedd5aacdf4b310d6e83919ac69bb1b09304b8e8'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['detect_secrets/plugins/keyword.py']}
|
merge
|
medium
|
month
|
easy
|
128 |
agronholm_anyio_file_commit_chain_0000
|
agronholm/anyio
|
master
|
MIT License
| 1,637 |
2018-08-19T09:07:18
|
async-await;asyncio;curio;trio
|
python
|
{'file': 'tests/test_taskgroups.py', 'branch': 'master', 'times_seen_consecutively': 3, 'purity': 1.0, 'newest_commit': 'd684f91b06fe0119bb854c3b7a804a9f1ce7cd6d', 'oldest_commit': 'c57a547157b4605101d82625913d9eb4f2fc53f2', 'contains_non_pl_files': False}
|
file_commit_chain
|
medium
|
month
|
easy
|
129 |
conan_io_conan_merge_0080
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'd0f2a1e312da80bd4b35232374977237f2ab0030', 'parents': ['9aae1d0ed96e9b99bbf921e21f1e69a0a704e21a', '5e42ca5c82fd70c678be671eb341afb19158ae51'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
130 |
conan_io_conan_merge_0081
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '82f5daa6aef52f408b586cba8f03eead973cd2cd', 'parents': ['3f8ae238b2bd172c874b91510d470d74c42b7c48', '6659dc680b02988c6f934a8b45a6117a912dbbcb'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['conan/tools/gnu/autotoolstoolchain.py', 'conans/__init__.py', 'conans/test/unittests/client/toolchain/autotools/autotools_toolchain_test.py']}
|
merge
|
medium
|
month
|
hard
|
131 |
conan_io_conan_merge_0082
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '937222b05cd46e0092f3cebb993cb66f8c6c352c', 'parents': ['151c1dd3b5c45b2c968a1bbe50b220027d415a37', '95da083793960b74f362a0db6323df37e31e58e9'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
132 |
conan_io_conan_merge_0083
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '524c4400a59626e1b8f699a9742b0445dfadbdff', 'parents': ['7b6609f7eb31f1dc3d8ce3824e6142155b12f202', '8e03c4bb70f33351d35a99a772d9793151fa8644'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/test/integration/settings/test_settings_user.py']}
|
merge
|
medium
|
month
|
hard
|
133 |
conan_io_conan_merge_0084
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '59029095e86eacd402083fca7c308b06889f6301', 'parents': ['5d18637f5771c8778dbd36e6abab0819ff83b74d', 'f416a7ef6ba852f58e1ea455ef3725a99a5cc300'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
134 |
conan_io_conan_merge_0085
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '5d18637f5771c8778dbd36e6abab0819ff83b74d', 'parents': ['e69fb8ce191dca741411ee7e23cc1b97227ae261', '906146f2a10a79731c8232ce47ff6abe12c2526a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
135 |
conan_io_conan_merge_0086
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '948130fffd15b359c01bcc07a9a69febe540ff16', 'parents': ['0add922ffa7ea3862c0a11db80018cde175a88f2', '86f0de62ecb8c53b3447b616d7e0fb021e072012'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
136 |
conan_io_conan_merge_0087
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'b7d930b4c225ee5022ea6b62a3570933a479a396', 'parents': ['fa0073fe730ac07aa0de7133664445e77d2898b8', 'e856565bdf9871bb91433881402d683c0ba9be36'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
137 |
conan_io_conan_merge_0088
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '2711baad5ed350e4fd059bc8cd81bb8c9c227feb', 'parents': ['bdee0f386087aa2c558effa0614c59ccad37bb22', 'ca2c729e6f9e5309fccd6ea382264d5b008c2066'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
138 |
conan_io_conan_merge_0089
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'b7340dd6f9384b6527622a9a31a9aa3f166b20c8', 'parents': ['e864df731109efb919b34133d53fc9757b69569e', '7dcabb7f03a28b2f11b963b5d66c7fe1eb6e7e30'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/test/command/search_test.py']}
|
merge
|
medium
|
month
|
medium
|
139 |
conan_io_conan_merge_0090
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '0783b80e83389b38d72b60a8d6183fdea6cd5745', 'parents': ['ec78165e9b11c83bfe061d3ee1340cdddcc7ddc3', '231882bcb35b79f7f878345b9e650b233985bcc7'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
140 |
conan_io_conan_merge_0091
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '8f6978290d095778eff6a9a84ea3f06f723fcfea', 'parents': ['b4d3ffc596d5ceade8ddd033803af5f36c8b3b74', 'a6127944a046027563a7f9875bc6a25f4fea29bb'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
141 |
conan_io_conan_merge_0092
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '4c243f42ceaee7e6dcf24cec7d920c72723d04e6', 'parents': ['431367b00efad24ff7ed932956ba10926df5a8d4', 'f73db16a63db59f3119ecf9eb4d3273521f80d36'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/client/conf/config_installer.py', 'conans/test/functional/command/config_install_test.py']}
|
merge
|
medium
|
month
|
hard
|
142 |
conan_io_conan_merge_0093
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'f312a4c0b470a3ddb36fe5c90aea88bb97438209', 'parents': ['7f239e1999e7a5485f44234a5322321031bb9fb3', '7098c6375680f053fb1018ad6b72446f75bed715'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
143 |
conan_io_conan_merge_0094
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '7a1f4e087df9dc24d13f3e12e6278a1e09095219', 'parents': ['48a6d443612aa5d134a8f197823adb2652cc4742', '8f8ccb7ec5b1dfbbfafd5134734061e340ef97c5'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
144 |
conan_io_conan_merge_0095
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'e86791d2dc53a2a2b2ce1c921a4fbb60d4578062', 'parents': ['26b327f500956221cc5c0d1c045aa2f745b22b7f', 'a52dcdc87dd8146b661ed650da616b9fcd2371e3'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/model/package_metadata.py', 'conans/test/functional/build_helpers/msbuild_test.py', 'conans/test/functional/command/search_test.py']}
|
merge
|
medium
|
month
|
hard
|
145 |
conan_io_conan_merge_0096
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '306d5e744b2b95e4e0ec28f22835a72cf9094d41', 'parents': ['69971b828a9e2d0a4a72dd6aadb5a386670f65be', 'fa8d1217f701bea7ba563f300390cc4b535a86c7'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
146 |
conan_io_conan_merge_0097
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '8b2817e81c22c9231962a9e5c84cf8a8b44981f2', 'parents': ['ca12f25dc6d5a11e640bbcb76e93d42205d3e0e7', 'ded64eb938eb68fd73808995383bf19d911c449d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
147 |
conan_io_conan_merge_0098
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'cfac8363bb9fd326944c116ed3e863d96b7efece', 'parents': ['9e334995ff73c05e77187f0a6f6d0bf988a64f16', '9844fd7e0cbf6930dc3ce50f0a5bf20da2a2c3ee'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/cmd/export.py', 'conans/test/integration/revisions_test.py', 'conans/test/unittests/util/tools_test.py']}
|
merge
|
medium
|
month
|
hard
|
148 |
conan_io_conan_merge_0099
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '0a9b4fac7c8bb6b44006abb69dffd2090519fc65', 'parents': ['7fc959e38a0027060cca641ad78c44c6904861d9', '8112ff0eb69079bcc72d04423ad6fc2e8a91b257'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/graph/graph_builder.py']}
|
merge
|
medium
|
month
|
hard
|
149 |
conan_io_conan_merge_0100
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '5d6844626cf4603955258d7a4c2184c01aafde1c', 'parents': ['183382042286b56de054198a279ec32e25024fda', 'dd159855987767a6596e55bce0caca8f7374e6ed'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
150 |
conan_io_conan_merge_0101
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '97b1d5ca44b2265d2ce16fec55577fa0e26401b7', 'parents': ['120e64ba2d7a182c7274016bc3dee82bf6e0409c', '49a81b3e70314082777c736bb644efb88752a904'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
151 |
conan_io_conan_merge_0102
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '9eba04d9d6119abbbbef68990f24a3f4343286f6', 'parents': ['52527840345592575f25d5be5278a3fef0905055', 'acf923c68dc5ccbbac41602ed5845a200656ee80'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/conan_api.py']}
|
merge
|
medium
|
month
|
hard
|
152 |
conan_io_conan_merge_0103
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '52527840345592575f25d5be5278a3fef0905055', 'parents': ['c422dcd3163789ffb3b00ec1606701b676c3a3df', '880764246fc5bfe04e984e236aeef28af0112f82'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
153 |
conan_io_conan_merge_0104
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '26ddf94bba4431ddeb2444dc1302bea5439be0dd', 'parents': ['e7e599209359d8801e06511c1b9115680fb91a7e', '2afb98361c2a5981cec3da505628f0aa1570965c'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
154 |
conan_io_conan_merge_0105
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '52527840345592575f25d5be5278a3fef0905055', 'parents': ['c422dcd3163789ffb3b00ec1606701b676c3a3df', '880764246fc5bfe04e984e236aeef28af0112f82'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
155 |
conan_io_conan_merge_0106
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'e7e599209359d8801e06511c1b9115680fb91a7e', 'parents': ['6077f50be42a20253a3acbb8f05e6304ccb90aa0', '1fc573c954722360f794628bbd37c407fd21691b'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/__init__.py']}
|
merge
|
medium
|
month
|
easy
|
156 |
conan_io_conan_merge_0107
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '9f13ef607576620f8309b2f486c8f1c265d0f634', 'parents': ['dd4e9fa702ca7b24aa1b7cafd0f83433f99f1fb2', '302f83a95c6763f49ade3c7a917ad3b525ced6f1'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
|
merge
|
medium
|
month
|
hard
|
157 |
conan_io_conan_merge_0108
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'e9a4236af345182a95224a8a573c0449c8600127', 'parents': ['cb90658d05b41272a9e15891c0babab4637d2f8d', '0fb3d62e7217e5b5f185559bc1be18b8628d0c79'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps.py']}
|
merge
|
medium
|
month
|
easy
|
158 |
conan_io_conan_merge_0109
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '81d4fed6a98dc95640d8043a4390dc51832200b3', 'parents': ['2c2931676144c5e3fbd8be0d3231957aae97d60f', 'ebb9b1dc3cc7b3e79c4d6bd24944e1c3f44b962b'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/migrations_settings.py']}
|
merge
|
medium
|
month
|
hard
|
159 |
tinygrad_tinygrad_merge_0003
|
tinygrad/tinygrad
|
master
|
MIT License
| 24,078 |
2020-10-18T04:23:12
|
not available
|
python
|
{'merge_commit_hash': '97e2f08cf5c7abaa7c30da2f587dfa0475097533', 'parents': ['e35eaa6c7640b84870cb05b6924d8b1df5a161e7', '1b4d1823b7c2c6a0180c3923e0bdea0c8ff47341'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['tinygrad/codegen/uopgraph.py', 'tinygrad/dtype.py']}
|
merge
|
large
|
month
|
hard
|
160 |
tinygrad_tinygrad_merge_0004
|
tinygrad/tinygrad
|
master
|
MIT License
| 24,078 |
2020-10-18T04:23:12
|
not available
|
python
|
{'merge_commit_hash': '14f2a6716e53f71f6db4648f6e43a4faac498764', 'parents': ['983ad1a9dd98acf92df2750da3121aba64443fd8', 'e645a0e7661e751ef23b0877df831a207707e7e7'], '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
|
161 |
tinygrad_tinygrad_merge_0005
|
tinygrad/tinygrad
|
master
|
MIT License
| 24,078 |
2020-10-18T04:23:12
|
not available
|
python
|
{'merge_commit_hash': 'd037586e8952789aef53218da7c267864383c023', 'parents': ['838d46c7df5a11cc8092e3e6ebe0f4c43c6e356a', '42e5c8335e642aabdfc55d88b5cf9fa61db8c6f9'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['tinygrad/ops.py']}
|
merge
|
large
|
month
|
medium
|
162 |
tinygrad_tinygrad_merge_0006
|
tinygrad/tinygrad
|
master
|
MIT License
| 24,078 |
2020-10-18T04:23:12
|
not available
|
python
|
{'merge_commit_hash': '26eef48d0a97b229692b0b7af6f3a8b64f5bec3c', 'parents': ['ed86cf25ddf80aec0ecfd145bc6281bd749b9675', 'e1d61b048b1451eb6dc457800ffc3e049955ddd2'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['tinygrad/ops.py']}
|
merge
|
large
|
month
|
easy
|
163 |
tinygrad_tinygrad_merge_0007
|
tinygrad/tinygrad
|
master
|
MIT License
| 24,078 |
2020-10-18T04:23:12
|
not available
|
python
|
{'merge_commit_hash': '6d2df23f6a57f9e2dd47966fc43227521b30521b', 'parents': ['f755179c4ce338933c725956e2dd2dbb3f735038', '22e33795785f6c72449480e380ffdc213b5c7bbc'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['tinygrad/ops.py']}
|
merge
|
large
|
month
|
medium
|
164 |
tinygrad_tinygrad_merge_0008
|
tinygrad/tinygrad
|
master
|
MIT License
| 24,078 |
2020-10-18T04:23:12
|
not available
|
python
|
{'merge_commit_hash': '1d41a5c47a0c72c3e86a696c12caff2ae22bca78', 'parents': ['97f40913589d0d5fb04e21a50aea34072e5f7080', '282af21b95a9df4e647327755063f911d450bfe0'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['tinygrad/ops.py']}
|
merge
|
large
|
month
|
easy
|
165 |
tinygrad_tinygrad_merge_0009
|
tinygrad/tinygrad
|
master
|
MIT License
| 24,078 |
2020-10-18T04:23:12
|
not available
|
python
|
{'merge_commit_hash': 'e3670cff3f98a071520b72277d081cf8470a8035', 'parents': ['46e0a92180901a6c469d864dfe8558a67ac18e48', '4b48f166ec45ac621c67c44fc3bd71d265d8a885'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['tinygrad/runtime/support/compiler_hip.py']}
|
merge
|
large
|
month
|
medium
|
166 |
tinygrad_tinygrad_merge_0010
|
tinygrad/tinygrad
|
master
|
MIT License
| 24,078 |
2020-10-18T04:23:12
|
not available
|
python
|
{'merge_commit_hash': '48e013dbaa3890e57df9e54284fc2d56ff437ff6', 'parents': ['9d06b72a14fa4cbcfd79e9816871d174f7382c82', '4a114756f6d3dc8dca0aeae4fc784de44c25e3b2'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['tinygrad/device.py']}
|
merge
|
large
|
month
|
medium
|
167 |
tinygrad_tinygrad_merge_0011
|
tinygrad/tinygrad
|
master
|
MIT License
| 24,078 |
2020-10-18T04:23:12
|
not available
|
python
|
{'merge_commit_hash': 'c3390e0fe5d9b055507cc46a9731f84c7eeab95f', 'parents': ['841a0b00e5c314ef065cd8e76f8a50e52934fc12', '6ceecc961ea7d452d85c20e1ce642e7639ff9812'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['tinygrad/nn/optim.py', 'tinygrad/nn/state.py']}
|
merge
|
large
|
month
|
hard
|
169 |
conan_io_conan_merge_0110
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '8f1f02f94bc811e0d0fbd2d7cabd0577eb63cd5a', 'parents': ['1ece61d2edf73e81d7fb4219eb205a32ed40b47c', '233bfda88bdec34e53086e2bd358a1bde108d408'], 'number_of_files_with_merge_conflict': 5, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['conan/tools/cmake/cmake.py', 'conan/tools/cmake/toolchain.py', 'conan/tools/files/files.py', 'conan/tools/google/toolchain.py', 'conans/test/functional/toolchains/gnu/autotools/test_ios.py']}
|
merge
|
medium
|
month
|
hard
|
170 |
conan_io_conan_merge_0111
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '3ec1fbfb092fe1680473ed2b6f545239fada9df8', 'parents': ['1bc7f1f3070a3d3a274e5174a72b3d7bc8cad029', '58f4197a731358e00442d9cf19ac2126138ac9df'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/model/build_info.py']}
|
merge
|
medium
|
month
|
hard
|
171 |
conan_io_conan_merge_0112
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'f869c00590cc175cce4cf0dab0908f54f745bf85', 'parents': ['82c17fc23470e5003b26aeaf15c9c2c95f629d62', '2c03f3e9a7e7c2f0a5627ab6d126950d09e76391'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conan/tools/microsoft/toolchain.py', 'conans/client/conf/__init__.py']}
|
merge
|
medium
|
month
|
hard
|
172 |
conan_io_conan_merge_0113
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'd20ed69823cdb55b420bd02414028d4a5f897277', 'parents': ['78d8b08e661a7e8958779f0545deee8051996979', '2e54d45e532d7d8e4b730e1265f2fe3711be2863'], 'number_of_files_with_merge_conflict': 4, 'total_number_of_merge_conflicts': 5, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/conf/detect.py', 'conans/test/unittests/tools/cmake/test_cmaketoolchain.py', 'conans/test/unittests/tools/microsoft/test_msbuild.py']}
|
merge
|
medium
|
month
|
hard
|
173 |
conan_io_conan_merge_0114
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'ae496cc260a9ed66aa6f2602ee8afd2955b69240', 'parents': ['5d1071581b9b16f050cb1449f27305842ef9544e', '4eb1dfc8cb5a067de19a99062d2c2e9c318d4522'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/rest/rest_client.py']}
|
merge
|
medium
|
month
|
hard
|
174 |
conan_io_conan_merge_0115
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '694c7115521fcd0bf14424c2842702e7f890c401', 'parents': ['318b4df22d1683987909abcddaad502ed6a30938', '7030477dd18196970bebfb8e1227dbaaa19d9c85'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['conans/model/requires.py']}
|
merge
|
medium
|
month
|
medium
|
175 |
conan_io_conan_merge_0116
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '86b94c5f40b65f1338bbc7322b821fe42ccb1c79', 'parents': ['36add593ffef7d21982a9a7642bfdb8e7d41e0ce', 'c7521fc39c33c1212f389abea455913d3cec3425'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['conans/client/loader.py']}
|
merge
|
medium
|
month
|
easy
|
176 |
conan_io_conan_merge_0117
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': 'bf79003859964a861fbc185835b9e3296cae0d44', 'parents': ['a51d035a4e8ede86f910b423c570bc699e7dcd15', 'a84e3ab7457a965044c56fd47e268124584d7df4'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/conf/detect.py']}
|
merge
|
medium
|
month
|
hard
|
177 |
conan_io_conan_merge_0118
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '9adf5174d3ed8ae1519353bd604ad8b1e92fb958', 'parents': ['4a6927316fd4d913c24c8c20b28795c3c324d789', 'd8697bc5aa84e188a2dbddd1bfb983c0e2a41da3'], 'number_of_files_with_merge_conflict': 3, 'total_number_of_merge_conflicts': 6, 'files_in_merge_conflict': ['conans/__init__.py', 'conans/client/generators/cmake_common.py', 'conans/test/unittests/client/rest/uploader_test.py']}
|
merge
|
medium
|
month
|
hard
|
178 |
conan_io_conan_merge_0119
|
conan-io/conan
|
develop2
|
MIT License
| 7,782 |
2015-12-01T01:17:02
|
c;cmake;conan;cplusplus;cpp;multi-platform;package-manager
|
python
|
{'merge_commit_hash': '65a5bc2b23757d070a00c209853950c109acbccf', 'parents': ['3919db63f2468aa63121d222bda557772b1c33d0', '7ad550b09d0d561ab807d751c1bd93376764505a'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 4, 'files_in_merge_conflict': ['conans/client/graph/graph_builder.py']}
|
merge
|
medium
|
month
|
medium
|
179 |
google_flax_merge_0001
|
google/flax
|
main
|
Apache License 2.0
| 5,538 |
2020-01-10T09:48:37
|
jax
|
python
|
{'merge_commit_hash': 'becff1cf2d14927107368ad62f5f1a3a4be0250e', 'parents': ['dacbe35e4cd26365427da88a9b61e9305ceb4ce6', '64997959c388570510375b383f4ddd1d8eadf3a0'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['flax/jax_utils.py']}
|
merge
|
medium
|
month
|
easy
|
180 |
google_flax_merge_0002
|
google/flax
|
main
|
Apache License 2.0
| 5,538 |
2020-01-10T09:48:37
|
jax
|
python
|
{'merge_commit_hash': '1dbd90eaedcb0c11b7f687275d995075f07dd467', 'parents': ['320f88323fd52699907bcf9c23e8ae65c121b855', '6da4a003eae5c6c5c891da0a51fdfd8141a3c3ef'], 'number_of_files_with_merge_conflict': 2, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['flax/linen/__init__.py', 'flax/linen/normalization.py']}
|
merge
|
medium
|
month
|
hard
|
181 |
google_flax_merge_0003
|
google/flax
|
main
|
Apache License 2.0
| 5,538 |
2020-01-10T09:48:37
|
jax
|
python
|
{'merge_commit_hash': '98453e51c1a8de6d7ac75f89195b0276d33f09a5', 'parents': ['af129499f75e06ae4e0b8186fca37694a3eebe3c', 'c62891044d2a753265327eba90f42c7e517df198'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 1, 'files_in_merge_conflict': ['flax/linen/stochastic.py']}
|
merge
|
medium
|
month
|
easy
|
182 |
jittor_jittor_file_commit_chain_0000
|
jittor/jittor
|
master
|
Apache License 2.0
| 3,021 |
2020-03-18T02:06:07
|
cuda;deep-learning;gpu;jittor;python
|
python
|
{'file': 'python/jittor/misc.py', 'branch': 'origin/cumsum', 'times_seen_consecutively': 3, 'purity': 1.0, 'newest_commit': '546860e19e30ab9fdbabf5e3c20acb053ce911f4', 'oldest_commit': '010d306163bd344cf4257588a4dfbb1643ce0982', 'contains_non_pl_files': False}
|
file_commit_chain
|
medium
|
month
|
easy
|
183 |
jittor_jittor_file_commit_chain_0001
|
jittor/jittor
|
master
|
Apache License 2.0
| 3,021 |
2020-03-18T02:06:07
|
cuda;deep-learning;gpu;jittor;python
|
python
|
{'file': 'python/jittor/__init__.py', 'branch': 'origin/fix-triu', 'times_seen_consecutively': 3, 'purity': 0.68, 'newest_commit': '3d40091693c20ced11418bde716847ca9997dc9d', 'oldest_commit': '2f0e243e017ca4ed47d6049812cf2265c0fe4750', 'contains_non_pl_files': False}
|
file_commit_chain
|
medium
|
month
|
hard
|
184 |
jittor_jittor_merge_0000
|
jittor/jittor
|
master
|
Apache License 2.0
| 3,021 |
2020-03-18T02:06:07
|
cuda;deep-learning;gpu;jittor;python
|
python
|
{'merge_commit_hash': '35f06bfa872e47d8bcdea7f41159fe4e3ab6aa44', 'parents': ['b0669c11c0fa9e81580c92fbe0e660a79f86174e', '97e06526509be1f89685e52264ff117ed7bf218d'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['python/jittor/nn.py']}
|
merge
|
medium
|
month
|
medium
|
186 |
jittor_jittor_merge_0002
|
jittor/jittor
|
master
|
Apache License 2.0
| 3,021 |
2020-03-18T02:06:07
|
cuda;deep-learning;gpu;jittor;python
|
python
|
{'merge_commit_hash': 'a859396aa8344a3d0113d49909564083387673c3', 'parents': ['395733f85abdfdbcf17377912cbbfd32b3fae9e0', 'd61dcc8f8e33b627131d2336acdc30f350f67e0e'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 2, 'files_in_merge_conflict': ['python/jittor/nn.py']}
|
merge
|
medium
|
month
|
medium
|
187 |
jittor_jittor_merge_0003
|
jittor/jittor
|
master
|
Apache License 2.0
| 3,021 |
2020-03-18T02:06:07
|
cuda;deep-learning;gpu;jittor;python
|
python
|
{'merge_commit_hash': 'acfceca90f793f9c0374651a12b973d3a223d473', 'parents': ['d792ba55b31978c63dacff8e7f74b6bd2889232a', 'fc9b22e796f95ee0cc24529e9a3516ce390e83a3'], 'number_of_files_with_merge_conflict': 1, 'total_number_of_merge_conflicts': 3, 'files_in_merge_conflict': ['python/jittor/nn.py']}
|
merge
|
medium
|
month
|
medium
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.