wiki-v1 icon indicating copy to clipboard operation
wiki-v1 copied to clipboard

Configure git to allow-unrelated-histories

Open robp2175 opened this issue 5 years ago • 0 comments

Actual behavior

FETCH_HEAD\nfatal: refusing to merge unrelated histories\n

I am committing to my gitlab repo from two different places. I don't plan to ever create content directly on Wiki.js. However due to this fact I get this error which can easily be avoided by adding --allow-unrelated-histories. However, I am not sure exactly where I would add this in /libs/git.js

Expected behavior

Allow --allow-unrelated-histories

Steps to reproduce the behavior

Without adding this tag permanently, this will fail after any time I perform a push from the other location. I understand that I will need to add this back in if there is ever an upgrade to this file.

I know this is not the place and will fill out a feature request, but it would be great to be able to add additional git flags in the config. However, this would certainly be low on the prioity list.

robp2175 avatar Mar 29 '19 11:03 robp2175