merge: force edit and no-ff mode when merging a tag object