The problem is meant to deal with future conflicts as well as present ones, and re-checking on every update would be a pain. The more memorable and natural you

The problem is meant to deal with future conflicts as well as present ones, and re-checking on every update would be a pain. The more memorable and natural your aliases, the more likely they are to get clobbered later ….