Twitter Feed
@polotek ("Marco Rogers") replied to a tweet by @polotek:
Automatic resolution of merge conflicts. This was truly revolutionary for software development. It’s hard to convey. Before this you had to resolve conflicts manually. But instead of doing that, people would just fight so nobody was trying to touch the same file at the same time.