I have created feature branch from develop and made some commit and pushed to bit bucket server repository. Later when I merge develop into feature branch and try to push merge commit to remote branch git throws error saying " The commit with the hash "73be7c9527" has two parents, but merge commits are not allowed". I would really appreciate if anyone help me solving this issue. Thanks. Could you please help me as this is blocking me from last 2 weeks.
C:\repo>git push Counting objects: 105, done. Delta compression using up to 4 threads. Compressing objects: 100% (92/92), done. Writing objects: 100% (105/105), 52.83 KiB | 0 bytes/s, done. Total 105 (delta 46), reused 0 (delta 0) remote: [The commit with the hash "%s" has two parents, but merge commits are not allowed] The commit with the hash "73be7c9527fc" To http://************:7990/scm/*/repo.git ! [remote rejected] OO-23554 -> OO-23554 (pre-receive hook declined) error: failed to push some refs to 'http://********:7990/scm/*/repo.git'
Hi, could you provide a git log so I can see what's going on there in your tree?
git log --oneline --graph --decorate --all
Please remove sensitive information from git log if there is such info.
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.