> Whenever possible, though, I just use multiple workspaces if > I need to stop in the middle of a long-term change to fix > something. It's simple, obvious and not very error prone. Me too, though on occasion it can seem schizophrenic to have a conflict with myself!