overtone/overtone — comment on commit 5a9915bca3d85724fbff12221b5d3ec44bedb0cf
File:  line 0
By samaaron:

it's weird that all these changes had to be commit again. Perhaps a rebase might help avoid such a thing? I wonder if this kind of conflict commit can let old bugs slip through again...