stg import -3 how to complete the patch after resolving conflict?

[jacob-keller]

I've been having trouble with figuring out how to complete an import after resolving a conflict when stg import has the -3 option.

With regular git, it is extremely easy: "git am --continue". But there is no equivalent in stgit and no documentation explaining what to do. If you try "stg update --add" and then stg refresh, it will merge the changes to the top patch of the series. If you try "stg new" it will create a brand new patch without the commit information from the import.

Is there an easy way to continue after a merge and I'm just missing something? Could the steps be documented or output when the stg import fails?

So far I've found the simplest/easiest way for me to handle this is to use git am and then stg repair which is somewhat annoying.