Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Pre receive hook decline ( the commit with the hash %s has 2 parents

Madhu March 3, 2020

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'

 

1 answer

0 votes
Egor Kovetskiy March 3, 2020

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.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events