search

internetguru / flow

Use Git Flow with ease – maintain branches, semantic versioning, releases, and changelog with a single command.
Other
41 stars 6 forks source link

Resolving conflict #65

Closed jiripavelka closed 1 year ago

jiripavelka commented 7 years ago

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.