[xorcist]

That terminology is identical in git, likely inspired by cvs and svn, so that bit probably won't improve.

It's inherently confusing to juggle different trees, and clearly you need some terminology for it. At least this one has become a bit of a standard.

[magicalhippo]

Main reason is we have relatively few merge conflicts despite merging a lot. So I always forget between instances.