Lightweight branching is coming "soon" and will help this exact issue. Contact me for more info.