Bug#872523: fatal: refusing to merge unrelated histories

2017-08-18 Thread Sean Whitton
Hello, On Fri, Aug 18 2017, PICCA Frederic-Emmanuel wrote: >>--allow-unrelated-histories > > I tryed with this options but Igot this error message. Yes, I didn't expect this to work. Sorry that my question wasn't clear. I need you to look in the DotDir.hs file in your tree, to see if it co

Bug#872523: fatal: refusing to merge unrelated histories

2017-08-18 Thread PICCA Frederic-Emmanuel
Hello Sean > git changed its behaviour, but there was a fix added to DotDir.hs some > time ago. What version are you upgrading from? Please look in > DotDir.hs in your repo for the string my local.propellor repository contained the 3.2.3 version. Then I upgrade my unstable machine with the late

Bug#872523: fatal: refusing to merge unrelated histories

2017-08-18 Thread Sean Whitton
control: tag -1 +moreinfo Hello Fred, On Fri, Aug 18 2017, picca wrote: > I just tryed to integrate the new propellor files into my > repository, but this time I got this error message > > :~/LANG=C git merge upstream/master > fatal: refusing to merge unrelated histories > > I do not think that

Bug#872523: fatal: refusing to merge unrelated histories

2017-08-17 Thread picca
Package: propellor Version: 4.7.6-1 Severity: normal Dear Maintainer, I just tryed to integrate the new propellor files into my repository, but this time I got this error message :~/LANG=C git merge upstream/master fatal: refusing to merge unrelated histories I do not think that this is normal