Yeah, the rebasing complaint isn't fair if you're using a modern VCS. I used to work on a large team at Cisco Systems that used Clearcase. Clearcase does not d

Yeah, the rebasing complaint isn't fair if you're using a modern VCS. I used to work on a large team at Cisco Systems that used Clearcase. Clearcase does not do merges. If anything has changed in master, you have to check out again, which obliterates all local changes. (I have never met a developer who liked Clearcase. It was built to simplify life for system administrators and to tick the right boxes for management, not to be useful for developers.) My general VCS experience is that you can't roll back a commit without also rolling back all subsequent commits, related or not. I'm glad to hear that modern systems have fixed that. (It looks like even Subversion does that now, cool!)