A better way for suboptimal workflow to begin with („multitasking” on branches)?