Skip to main content

[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

Popular posts from this blog

How to reset password of Jenkins

Reset password of JenkinsPrefer way, No securities were harmedSee also:
What is Jenkins' initial admin password

To reset it without disabling security if you're using matrix permissions (probably easily adaptable to other login methods): In config.xml, set disableSignup to false.Restart Jenkins.Go to the Jenkins web page and sign up with a new user.In config.xml, duplicate one of the <permission>hudson.model.Hudson.Administer:username</permission> lines and replace username with the new user.If it's a private server, set disableSignup back to true in config.xml.Restart Jenkins.Go to the Jenkins web page and log in as the new user.Reset the password of the original user.Log in as the original user. Optional cleanup: Delete the new user.Delete the temporary <permission> line in config.xml.
Alternative way:
ssh to the server, disable authentication, set the password via the Jenkins Web UI, then enable authentication.

How to Remove / Hide "Powered by Blogger" (Attribution Gadget)

Settings -> Template -> Edit HTML -> Jump to widget: choose Attribution1

Change it to:

<b:widget id='Attribution1' locked='false' mobile='no' title='' type='Attribution'/>

Go to Layout, remove Attribution1 widget.

To hide: Template -> Customize ->  Advanced -> Add CSS - Paste the following code  -> Apply to Blog:
#Attribution1 { display: none!important; }