Skip to content

No merge commit on finishFeature with isRebase set to true #24

Open
Open
No merge commit on finishFeature with isRebase set to true#24

Description

@JTBrinkmann
JTBrinkmann
opened on Aug 7, 2018

when finishing a feature with the isRebase option set to true, the develop branch is fast-forwarded instead of being merged. Expected behavior (imo) is that the isRebase flag causes a rebase on develop before (additionally) merging with a forced merge-commit.

Gitflow explicitly specifies forcing a merge commit (--no-ff), so I whould consider this a nodegit-flow bug.

nodegit-flow/src/Feature.js

Lines 119 to 122 in fdf742b

// If the develop branch and feautre branch point to the same thing do not merge them
// or if the `isRebase` parameter is true do not merge
const isSameCommit = developCommit.id().toString() === featureCommit.id().toString();
cancelDevelopMerge = isSameCommit || isRebase;

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions