Hi Ben,

On 22 December 2017 at 17:57, Ben Coman btc@openinworld.com wrote:

...

Here are some further viewpoints on avoiding `git pull`... https://felipec.wordpress.com/2014/05/27/is-git-pull-broken/ https://adamcod.es/2014/12/10/git-pull-correct-workflow.html

cheers -ben

Thanks very much for pointing to these. I think I've hit this a couple of times in the past, and may have avoided problems had I known.

Those times, I adopted the "I give up" strategy at http://ohshitgit.com/#fuck-this-noise :-)

http://ohshitgit.com/ is also worth a read (my apologies, I didn't write down who supplied the link originally).

Cheers, Alistair