Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Javascript error with "no-ff" merge #49

Open
tomasfejfar opened this issue Oct 6, 2016 · 1 comment
Open

Javascript error with "no-ff" merge #49

tomasfejfar opened this issue Oct 6, 2016 · 1 comment

Comments

@tomasfejfar
Copy link

When I try to show no-ff merge I get (tried both positions):

git merge --no-ff master
Cannot read property 'parent' of null
git merge master --no-ff
Cannot read property 'parent' of null

image

@kheyse-werk
Copy link

kheyse-werk commented Mar 2, 2018

What you are trying to do is merge an older commit into a newer commit where the older commit is a direct ancestor of the newer commit.
Git would tell you "Already up to date." when you do that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants