Resolving conflict
jiripavelka opened this issue · 0 comments
jiripavelka commented
Specify the process of resolving conflicts and how to continue in case of merging feature or hotfix.
See section ADVANCED EXAMPLES in manual
Ideas: some kind of omgf --continue etc.