Hello Fred, On Sat, Aug 19 2017, PICCA Frederic-Emmanuel wrote:
> I did a > > git merge -Xtheirs upstream/master --allow-unrelated-hitories > > this wipeout my config-simple.hs. This is a workaround, yes. > So I ammended the merge in order to restore config.hs and fix it with > the new propellor. I hope that next timeit will work without all this > mess ;) propellor is meant to generate upstream/master in such a way that it can always be merged without --allow-unrelated-histories. Since you couldn't merge it, something went wrong with that. I'd like to track down the problem by examining your full DEBUG output. If you would like to help, please create a new branch starting at a commit before you did the workaround, such that the problem reoccurs, and then provide me with the full debug output upon spinning that branch. If you don't want to do this, please close the bug. -- Sean Whitton
signature.asc
Description: PGP signature
