Yeah that’s what I did as a workaround. Reset (soft) to the first parent commit and do a single commit with all the changes.