I'm not interested in placing blame, but if I did something wrong, would prefer to know how to do it better. Basically all I did was `git merge`, then edit the 3 conflicted files (none of which were the problematic fvLib.xml), then `git add` each of those files, then `git commit`. However, for a variety of reasons, including dinner and my infamiliarity with git, there was over a six hour period between the merge and the commit. Perhaps there was a change to that file during that period?
Make that "Hugh accidentally put it back during the merge" :-)
There might be any number of reasons why Syd’s branch didn’t pick that file up properly—all of them come down to human error. I don’t know whose, but it might well have been mine. Anyway, it’s easily fixed.