Skip to content

🐛 git merge --no-ff branch #5

Open
@kuychaco

Description

@kuychaco

Repro steps:

git commit (2x)
git checkout -b branch
git commit (2x)
git checkout master
git commit (3x)
git merge branch
git reset --hard [last commit]
git checkout branch
git merge master
git checkout master
git merge branch
git reset --hard [last commit]
git merge -no-ff branch
// Cannot read property 'parent' of null

Metadata

Metadata

Assignees

No one assigned

    Labels

    Type

    No type

    Projects

    No projects

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions