Help
cancel
Showing results for 
Search instead for 
Did you mean: 
Copilot Lvl 2
Message 21 of 31

Re: How to deal with "refusing to merge unrelated histories" error

I tried the --allow-unrelated-histories and got this:

 

warning: Cannot merge binary files: biostats.final.3.2.pdf (HEAD vs. 93379526ed908abd4f58b2010eb055aace5df522)

warning: Cannot merge binary files: .DS_Store (HEAD vs. 93379526ed908abd4f58b2010eb055aace5df522)

Auto-merging <file name here>

CONFLICT (add/add): Merge conflict in <file name here>

Auto-merging <file name here>

CONFLICT (add/add): Merge conflict in  <file name here>

Auto-merging  <file name here>

CONFLICT (add/add): Merge conflict in  <file name here>

Auto-merging  <file name here>

CONFLICT (add/add): Merge conflict in  <file name here>

Auto-merging  <file name here>

Automatic merge failed; fix conflicts and then commit the result.

Copilot Lvl 2
Message 22 of 31

Re: How to deal with "refusing to merge unrelated histories" error

I just found that this git push problem really ruined a lot of my code. It is very very sad and frustrating. This is a huge problem for me and I wish I knew what to do to prevent it.

Ground Controller Lvl 2
Message 23 of 31

Re: How to deal with "refusing to merge unrelated histories" error

Worked for me. Thank you and God Bless! :)

Ground Controller Lvl 1
Message 24 of 31

Re: How to deal with "refusing to merge unrelated histories" error

Its work for me. Thanks 

Ground Controller Lvl 1
Message 25 of 31

Re: How to deal with "refusing to merge unrelated histories" error

thanks alot... ^^

Ground Controller Lvl 1
Message 26 of 31

Re: How to deal with "refusing to merge unrelated histories" error

Undebatably the most useful solution ever to the most non-sensical error message ever.

Ground Controller Lvl 1
Message 27 of 31

Re: How to deal with "refusing to merge unrelated histories" error

thank u! work perfect

Ground Controller Lvl 2
Message 28 of 31

Re: How to deal with "refusing to merge unrelated histories" error

THANK YOU!!

This worked for me

Ground Controller Lvl 1
Message 29 of 31

Re: How to deal with "refusing to merge unrelated histories" error

Thanks. You just save me.

Ground Controller Lvl 1
Message 30 of 31

Re: How to deal with "refusing to merge unrelated histories" error

 I was also facing the same problem. But I realised I was trying to push my one git project material on other remote git project. Solution:

Clone the fresh project again and this time make sure cloning link is starting from ssh if you have added the SSH key and https:// if you have added the puttyKey.