Understanding Predictive Factors for Merge Conflicts

Ruby Sample


Git Repository # Merge Scenarios % Conflicting Merge Scenarios
24pullrequests/24pullrequests 504 10.3
AgileVentures/WebsiteOne 506 24.5
alphagov/whitehall 2701 1.1
annict/annict 327 15.6
appelier/bigtuna 57 28.1
asciinema/asciinema.org 22 31.8
asm-helpful/helpful-web 220 17.7
atmos/slash-heroku 9 33.3
benwbrum/fromthepage 409 16.9
bikeindex/bike_index 76 13.2
bloomberg/cartodb 7186 16.5
browsermedia/browsercms 97 23.7
huginn/huginn 505 10.1
catarse/catarse 2608 10.1
churchio/onebody 181 17.7
codefirst/AsakusaSatellite 34 8.8
comfy/comfortable-mexican-sofa 177 18.1
consul/consul 1009 19.0
askaway/askaway 147 19.7
coreinfrastructure/best-practices-badge 144 14.6
discourse/discourse 2937 1.1
edavis10/redmine-timesheet-plugin 8 12.5
education/classroom 394 10.1
ekylibre/ekylibre 1507 29.0
EOL/eol 1357 18.6
errbit/errbit 268 15.3
ets-berkeley-edu/calcentral 3447 0.9
expertiza/expertiza 989 26.6
fairmondo/fairmondo 3138 22.3
FarmBot/Farmbot-Web-API 284 15.8
fatfreecrm/fat_free_crm 368 14.7
feedbin/feedbin 205 12.2
fernandokosh/redmine_time_tracker 25 20.0
gems-uff/sapos 126 30.2
glebm/rails_email_preview 5 20.0
Growstuff/growstuff 714 18.6
HabitatMap/AirCasting 29 10.3
hashrocket/hr-til 38 5.3
helpyio/helpy 360 18.3
hitobito/hitobito 301 16.3
inaturalist/inaturalist 831 29.5
instructure/canvas-lms 173 19.1
gitlabhq/gitlab-contributors 7 14.3
Jellyfishboy/trado 95 35.8
jgraichen/redmine_dashboard 22 54.5
jsqu99/spree_flexi_variants 29 13.8
Katello/katello 3945 7.6
librariesio/libraries.io 115 25.2
linuxfoundation/cii-best-practices-badge 144 14.6
loomio/loomio 2305 14.6
lynndylanhurley/devise_token_auth 120 5.8
mephistorb/mephisto 22 4.5
mumuki/mumuki-laboratory 85 7.1
mysociety/alaveteli 1341 16.5
nasa/earthdata-search 861 20.7
natew/obtvse 66 28.8
Netflix/Scumblr 72 15.3
netguru/help 31 32.3
octobox/octobox 102 21.6
openaustralia/planningalerts 122 22.9
openstreetmap/openstreetmap-website 292 27.7
openSUSE/osem 517 2.1
opf/openproject 5655 16.6
orientation/orientation 61 31.1
ossfriday/ossfriday 42 16.7
otwcode/otwarchive 2270 10.2
peatio/peatio 171 23.4
pivotal/projectmonitor 41 9.7
pophealth/popHealth 186 24.2
projectblacklight/blacklight 411 6.6
publify/publify 335 9.5
r888888888/danbooru 418 3.1
radiant/radiant 189 30.2
rapidftr/RapidFTR 863 20.9
rbCAS/CASino 32 9.4
refinery/refinerycms-news 22 31.8
riseuplabs/crabgrass-core 387 8.0
rletters/rletters 24 20.8
rubygems/rubygems.org 428 4.9
rubytaiwan/ruby-taiwan 147 26.5
scaffeinate/socify 7 14.3
scottwillson/racing_on_rails 139 42.4
shakacode/react-webpack-rails-tutorial 34 2.9
sharetribe/sharetribe 1584 9.7
Shopify/shipit-engine 152 1.9
siwapp/siwapp 94 12.8
Spokenvote/spokenvote 190 16.8
spree-contrib/spree_active_shipping 14 21.4
square/kochiku 125 6.4
SUSE/Portus 327 2.7
swanson/stringer 119 6.7
tenex/rails-assets 37 10.8
theforeman/foreman 37 10.8
thredded/thredded 49 2.0
tomatoes-app/tomatoes 37 10.8
tootsuite/mastodon 261 18.4
TracksApp/tracks 275 9.1
vteams/open-source-billing 73 38.4
zammad/zammad 515 10.7
zendesk/samson 1292 2.9
aggregated sample (all merge scenarios) 61759 13.4