You know in chess when you and your opponent make the same move back and forth thrice that it's a draw.

git needs to realize when this "threefold repetition" is happening too. If I have a file with a line that I need for, let's say, local debugging, then the maintainer waxes that line to make it live, then I rebase, take it back out to test locally, then check back in, overwriting the live fix... ad infinitum.

That's bad. git, left to its own devices, will often auto-merge those changes without letting anyone know. It shouldn't.

Labels: ,