Ah great. I guess I primarily work on features that don't touch other code that changes (or other code doesn't change when I'm working on features...), so conflicts are minimal to begin with. Thanks for the heads up!