One possible solution to wanting multiple working trees may be: Make it real easy/nice to have a lightweight checkout of one of the branches in a colocated ehm..branch/dir/repo (do we have a name for this?), then make it easy to switch to one of its peer colocated branches.