Git Flow finishing a release with conflict upon merge.

[Sylvain Picory]

Hi everyone,

I would like to know what the best way to resume the Finish Feature functionnality after resolving all conflicts happening during the merge?

Thanks