Patrick Bos

Looking into the sourcecode now, I've traced the problem to line 2707 where the `self.git.manualmerge(left.sha1, logmsg)` call apparently fails. So I guess I'll have to somehow fix whatever that command...

Indeed, if I manually run the `git merge` command (`git merge --no-commit -m imerge 'RooFit_MultiProcess_PR': manual merge 1-3 86122e685e669210292c91cf7927db790590824a` to be exact in this case), after removing the problematic file...

Ok, good, I solved my immediate problem :) Perhaps it would be useful to print the `git merge` command that is run from `manualmerge`, if not from that command itself...

It seems the issue arises on merging `1-x` quite often. The `1` commit in this situation is a merge commit itself. I previously merged in the master branch that I'm...

I noticed that the exit code on the failing merge command is 128. Looking at the [git source code here](https://github.com/git/git/blob/b0c09ab8796fb736efa432b8e817334f3e5ee75a/merge-recursive.c#L3719), it seems this error code can be caused by several...

Hi Gérard! Did you build FFTW with single precision (32 bit float)? It says it's missing those libraries (FLOAT_LIB and FLOAT_OPENMP_LIB). Or more generally: how exactly did you build FFTW?...

Oh and as to your question about pkg-config: the module does actually use that :) https://github.com/egpbos/findFFTW/blob/ac788529392825067c9118f9f099aaa1efb77589/FindFFTW.cmake#L49

Could you try to run it just as `find_package(FFTW)`, without the components and see if it finds anything at all? It's quite puzzling that it doesn't. To see if it...

Sorry, what I meant with my previous comment was: could you try to run the same thing you ran before (the whole `CMakeLists.txt` file you pasted above) except replace the...

Btw, I wasn't actually aware that FFTW started shipping cmake config files! I don't know what these can provide exactly, but of course, you could try it out. To do...