Merge develop to the branch if conflict #30
Description
If we have conflict between develop and feature branch when finishing feature we need to merge develop in feature branch first. Is should be done because better commit conflict resolution in feature branch before finishing than in develop before.
But if we have not any conflict than feature branch should merge in develop as it does now.