January 27, 2017

[HDGEM] How to fix git: fatal: refusing to merge unrelated histories

You can use --allow-unrelated-histories to force the merge to happen.

"git merge" used to allow merging two branches that have no common base by default, which led to a brand new history of an existing project created and then get pulled by an unsuspecting maintainer, which allowed an unnecessary parallel history merged into the existing project. The command has been taught not to allow this by default, with an escape hatch "--allow-unrelated-histories" option to be used in a rare event that merges histories of two projects that started their lives independently.

--
Posted By Blogger to HDGEM at 1/27/2017 01:39:00 PM
Post a Comment

Featured Post

Payara Server – Robust, Reliable, Supported

Payara Server is an open source application server derived from GlassFish, with an option of 24/7 Production and Migration & Project Sup...