fatal refusing to merge unrelated histories

0 votes

Git refusing to merge unrelated histories on rebase

During git rebase origin/development, Git had displayed this ERROR message:-
 

fatal: refusing to merge unrelated histories 
Error redoing merge 1234deadbeef1234deadbeef

I am using the Git version 2.9.0 which has always worked out great in the previous version. My question is how could I continue this rebase which allows unrelated histories with the forced flag which was introduced in the new release?

Feb 8 in Others by Rahul
• 8,980 points
49 views

1 answer to this question.

0 votes

In order to clarify your doubt, this default behavior has been updated since the Git 2.9 version. The merging git option used to allow the merging of two branches that do not have a base common which is again, by default. This amplifies a brand new history of an existing project which has been created and following which, got pulled by an unsuspecting maintainer, which has allowed an unnecessary parallel history which is merged with the existing project. This is not to allow this by default with an escape hatch but rather, why the command has been taught to us. The --allow-unrelated-histories line could be used in an unusual event that merges the past of the two given projects where they had started their lives independently.


 

answered Feb 8 by Soham
• 8,730 points

Related Questions In Others

0 votes
1 answer

Git refusing to merge unrelated histories on rebase

To answer your question, the “git merge” ...READ MORE

answered Feb 9 in Others by Rahul
• 8,980 points
62 views
0 votes
1 answer

How to check if array is multidimensional or not?

Since the 'second dimension' could be just ...READ MORE

answered Nov 5, 2018 in Others by DataKing99
• 8,240 points
3,860 views
0 votes
1 answer
0 votes
1 answer

How is machine learning used to detect objects?

To understand the surrounding environment in real ...READ MORE

answered Nov 30, 2018 in Others by Kailash
271 views
+15 votes
2 answers

Git management technique when there are multiple customers and need multiple customization?

Consider this - In 'extended' Git-Flow, (Git-Multi-Flow, ...READ MORE

answered Mar 27, 2018 in DevOps & Agile by DragonLord999
• 8,450 points
1,569 views
+2 votes
1 answer
0 votes
1 answer

How to take a screenshot of a current Activity and then share it?

For me, I captured and then shared ...READ MORE

answered Feb 8 in Others by Soham
• 8,730 points
11 views
webinar REGISTER FOR FREE WEBINAR X
Send OTP
REGISTER NOW
webinar_success Thank you for registering Join Edureka Meetup community for 100+ Free Webinars each month JOIN MEETUP GROUP