This worked for me: git pull git checkout dev Martin Holmes UVic Humanities Computing and Media Centre mholmes@uvic.ca ________________________________________ From: tei-council-bounces@lists.tei-c.org <tei-council-bounces@lists.tei-c.org> on behalf of Hugh Cayless <philomousos@gmail.com> Sent: October 29, 2015 7:07 AM To: James Cummings; tei-council@lists.tei-c.org Subject: Re: [tei-council] Switching branches Dunno. Clone again?
On Oct 29, 2015, at 14:26 , James Cummings <James.Cummings@it.ox.ac.uk> wrote:
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 -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived
-- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council PLEASE NOTE: postings to this list are publicly archived