> I don't mind either option, but personally would probably go with > merging+conflict resolutions rather than rebase given that it is possible. Okay, thanks for the input. I'll push the bundle as is, then, as that is what it already does.