I should add that the merge error message I get is 'both modified' even though I promise I have not touched these files (let alone even know of their existence).
-- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
