Yes, that's what we do at work with a tool similar to changie (https://github.com/miniscruff/changie) - which is really a conflict-free workflow that works pretty well.