kellogh, call me pedantic, but if you're going to make a change that causes merge conflicts in 82 files, you should first send a headsup to the team, and possibly offer to help resolve merge conflicts
kellogh, call me pedantic, but if you're going to make a change that causes merge conflicts in 82 files, you should first send a headsup to the team, and possibly offer to help resolve merge conflicts