It’s painful but this is the way. Especially if your team is slow at merging.