
29 Oct
2015
29 Oct
'15
6:26 a.m.
On 29/10/15 10:33, Hugh Cayless wrote:
git fetch git checkout dev
When I attempt this it seems to claim that I've a conflict that needs to be merged with everything in the repo. I've made no changes. -James -- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford