On 10 Oct 2017, at 17:42, "Daniel J. Luke" <[email protected]> wrote: > If the OP does have a need to be syncing from the git repository, he should > be able to manage any conflicts like this without help from the list.
As I said, I didn't modify the checkout.
