create sub branch, finish the feature and create merge request Merge to dev branch, squash commit and delete sub branch after merging. The main branch is for release ...