Yes, this is common practice in many orgs for that reason, as well as that it makes resolving merge conflicts easier.