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 latest 4.6.x version you uploaded recently. I did nothing special... > --allow-unrelated-histories I tryed with this options but Igot this error message. picca@mordor:~/.propellor$ LANG=C git merge --allow-unrelated-histories upstream/master Auto-merging stack.yaml CONFLICT (add/add): Merge conflict in stack.yaml Auto-merging src/wrapper.hs CONFLICT (add/add): Merge conflict in src/wrapper.hs Auto-merging src/Utility/UserInfo.hs CONFLICT (add/add): Merge conflict in src/Utility/UserInfo.hs Auto-merging src/Utility/SystemDirectory.hs CONFLICT (add/add): Merge conflict in src/Utility/SystemDirectory.hs Auto-merging src/Utility/Scheduled.hs CONFLICT (add/add): Merge conflict in src/Utility/Scheduled.hs Auto-merging src/Utility/SafeCommand.hs CONFLICT (add/add): Merge conflict in src/Utility/SafeCommand.hs Auto-merging src/Utility/Process.hs CONFLICT (add/add): Merge conflict in src/Utility/Process.hs Auto-merging src/Utility/Path.hs CONFLICT (add/add): Merge conflict in src/Utility/Path.hs Auto-merging src/Utility/PartialPrelude.hs CONFLICT (add/add): Merge conflict in src/Utility/PartialPrelude.hs Auto-merging src/Utility/Misc.hs CONFLICT (add/add): Merge conflict in src/Utility/Misc.hs Auto-merging src/Utility/LinuxMkLibs.hs CONFLICT (add/add): Merge conflict in src/Utility/LinuxMkLibs.hs Auto-merging src/Utility/FileSystemEncoding.hs CONFLICT (add/add): Merge conflict in src/Utility/FileSystemEncoding.hs Auto-merging src/Utility/FileMode.hs CONFLICT (add/add): Merge conflict in src/Utility/FileMode.hs Auto-merging src/Utility/Exception.hs CONFLICT (add/add): Merge conflict in src/Utility/Exception.hs Auto-merging src/Utility/DataUnits.hs CONFLICT (add/add): Merge conflict in src/Utility/DataUnits.hs Auto-merging src/Propellor/Types/ZFS.hs CONFLICT (add/add): Merge conflict in src/Propellor/Types/ZFS.hs Auto-merging src/Propellor/Types/Result.hs CONFLICT (add/add): Merge conflict in src/Propellor/Types/Result.hs Auto-merging src/Propellor/Types/OS.hs CONFLICT (add/add): Merge conflict in src/Propellor/Types/OS.hs Auto-merging src/Propellor/Types/MetaTypes.hs CONFLICT (add/add): Merge conflict in src/Propellor/Types/MetaTypes.hs Auto-merging src/Propellor/Types/Info.hs CONFLICT (add/add): Merge conflict in src/Propellor/Types/Info.hs Auto-merging src/Propellor/Types/Docker.hs CONFLICT (add/add): Merge conflict in src/Propellor/Types/Docker.hs Auto-merging src/Propellor/Types/Dns.hs CONFLICT (add/add): Merge conflict in src/Propellor/Types/Dns.hs Auto-merging src/Propellor/Types/Core.hs CONFLICT (add/add): Merge conflict in src/Propellor/Types/Core.hs Auto-merging src/Propellor/Types/CmdLine.hs CONFLICT (add/add): Merge conflict in src/Propellor/Types/CmdLine.hs Auto-merging src/Propellor/Types/Chroot.hs CONFLICT (add/add): Merge conflict in src/Propellor/Types/Chroot.hs Auto-merging src/Propellor/Types.hs CONFLICT (add/add): Merge conflict in src/Propellor/Types.hs Auto-merging src/Propellor/Ssh.hs CONFLICT (add/add): Merge conflict in src/Propellor/Ssh.hs Auto-merging src/Propellor/Spin.hs CONFLICT (add/add): Merge conflict in src/Propellor/Spin.hs Auto-merging src/Propellor/Shim.hs CONFLICT (add/add): Merge conflict in src/Propellor/Shim.hs Auto-merging src/Propellor/Property/ZFS/Process.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/ZFS/Process.hs Auto-merging src/Propellor/Property/User.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/User.hs Auto-merging src/Propellor/Property/Unbound.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Unbound.hs Auto-merging src/Propellor/Property/Tor.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Tor.hs Auto-merging src/Propellor/Property/Systemd.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Systemd.hs Auto-merging src/Propellor/Property/Sudo.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Sudo.hs Auto-merging src/Propellor/Property/Ssh.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Ssh.hs Auto-merging src/Propellor/Property/SiteSpecific/JoeySites.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/SiteSpecific/JoeySites.hs Auto-merging src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs Auto-merging src/Propellor/Property/Sbuild.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Sbuild.hs Auto-merging src/Propellor/Property/Rsync.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Rsync.hs Auto-merging src/Propellor/Property/Reboot.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Reboot.hs Auto-merging src/Propellor/Property/Partition.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Partition.hs Auto-merging src/Propellor/Property/Parted.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Parted.hs Auto-merging src/Propellor/Property/OpenId.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/OpenId.hs Auto-merging src/Propellor/Property/Obnam.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Obnam.hs Auto-merging src/Propellor/Property/OS.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/OS.hs Auto-merging src/Propellor/Property/Network.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Network.hs Auto-merging src/Propellor/Property/Mount.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Mount.hs Auto-merging src/Propellor/Property/Logcheck.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Logcheck.hs Auto-merging src/Propellor/Property/Locale.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Locale.hs Auto-merging src/Propellor/Property/List.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/List.hs Auto-merging src/Propellor/Property/LightDM.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/LightDM.hs Auto-merging src/Propellor/Property/Hostname.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Hostname.hs Auto-merging src/Propellor/Property/HostingProvider/Linode.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/HostingProvider/Linode.hs Auto-merging src/Propellor/Property/Grub.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Grub.hs Auto-merging src/Propellor/Property/Gpg.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Gpg.hs Auto-merging src/Propellor/Property/Fstab.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Fstab.hs Auto-merging src/Propellor/Property/FreeBSD/Poudriere.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/FreeBSD/Poudriere.hs Auto-merging src/Propellor/Property/FreeBSD/Pkg.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/FreeBSD/Pkg.hs Auto-merging src/Propellor/Property/Firewall.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Firewall.hs Auto-merging src/Propellor/Property/Firejail.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Firejail.hs Auto-merging src/Propellor/Property/File.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/File.hs Auto-merging src/Propellor/Property/Docker.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Docker.hs Auto-merging src/Propellor/Property/Dns.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Dns.hs Auto-merging src/Propellor/Property/DiskImage/PartSpec.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/DiskImage/PartSpec.hs Auto-merging src/Propellor/Property/DiskImage.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/DiskImage.hs Auto-merging src/Propellor/Property/Debootstrap.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Debootstrap.hs Auto-merging src/Propellor/Property/DebianMirror.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/DebianMirror.hs Auto-merging src/Propellor/Property/Cron.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Cron.hs Auto-merging src/Propellor/Property/ConfFile.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/ConfFile.hs Auto-merging src/Propellor/Property/Conductor.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Conductor.hs Auto-merging src/Propellor/Property/Concurrent.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Concurrent.hs Auto-merging src/Propellor/Property/Cmd.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Cmd.hs Auto-merging src/Propellor/Property/Chroot.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Chroot.hs Auto-merging src/Propellor/Property/Ccache.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Ccache.hs Auto-merging src/Propellor/Property/Borg.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Borg.hs Auto-merging src/Propellor/Property/Attic.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Attic.hs Auto-merging src/Propellor/Property/Apt/PPA.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Apt/PPA.hs Auto-merging src/Propellor/Property/Apt.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Apt.hs Auto-merging src/Propellor/Property/Apache.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property/Apache.hs Auto-merging src/Propellor/Property.hs CONFLICT (add/add): Merge conflict in src/Propellor/Property.hs Auto-merging src/Propellor/PrivData.hs CONFLICT (add/add): Merge conflict in src/Propellor/PrivData.hs Auto-merging src/Propellor/Message.hs CONFLICT (add/add): Merge conflict in src/Propellor/Message.hs Auto-merging src/Propellor/Info.hs CONFLICT (add/add): Merge conflict in src/Propellor/Info.hs Auto-merging src/Propellor/Gpg.hs CONFLICT (add/add): Merge conflict in src/Propellor/Gpg.hs Auto-merging src/Propellor/Git/Config.hs CONFLICT (add/add): Merge conflict in src/Propellor/Git/Config.hs Auto-merging src/Propellor/Git.hs CONFLICT (add/add): Merge conflict in src/Propellor/Git.hs Auto-merging src/Propellor/EnsureProperty.hs CONFLICT (add/add): Merge conflict in src/Propellor/EnsureProperty.hs Auto-merging src/Propellor/Engine.hs CONFLICT (add/add): Merge conflict in src/Propellor/Engine.hs Auto-merging src/Propellor/DotDir.hs CONFLICT (add/add): Merge conflict in src/Propellor/DotDir.hs Auto-merging src/Propellor/Container.hs CONFLICT (add/add): Merge conflict in src/Propellor/Container.hs Auto-merging src/Propellor/CmdLine.hs CONFLICT (add/add): Merge conflict in src/Propellor/CmdLine.hs Auto-merging src/Propellor/Bootstrap.hs CONFLICT (add/add): Merge conflict in src/Propellor/Bootstrap.hs Auto-merging propellor.cabal CONFLICT (add/add): Merge conflict in propellor.cabal Auto-merging joeyconfig.hs CONFLICT (add/add): Merge conflict in joeyconfig.hs Auto-merging doc/README.mdwn CONFLICT (add/add): Merge conflict in doc/README.mdwn Auto-merging debian/control CONFLICT (add/add): Merge conflict in debian/control Auto-merging debian/compat CONFLICT (add/add): Merge conflict in debian/compat Auto-merging debian/changelog CONFLICT (add/add): Merge conflict in debian/changelog Auto-merging config-simple.hs CONFLICT (add/add): Merge conflict in config-simple.hs Auto-merging config-freebsd.hs CONFLICT (add/add): Merge conflict in config-freebsd.hs Auto-merging Makefile CONFLICT (add/add): Merge conflict in Makefile Automatic merge failed; fix conflicts and then commit the result.
