Re: [Rails-devel] 1880 and 1846

[Erik V. <eri...@xs...>]

Hi Martin,

 

I made the mistake to do a ‘git pull’ without first checking my own status after a long time of inactivity, and now I seem to be in a mess. 

 

Gitbash now reports my status as ‘((v1.7.12)|MERGING), so I suppose I was in the v1.7.12 branch. Don’t remember why.

I also seem to have had some uncommitted local changes, including a detail in 18EU/Map.xml,  some initial work for 1837 (map etc.), and the new ‘trainMutexID’ Access attribute that I had proposed last year.

 

As it seems I was in the wrong branch, I think there is not much point in attempting to resolve the merge conflict as it is.

All I really want is to undo that misguided ‘git pull’, and to revert to the situation before that, so I can put my house in order first.

But I’m not sure if there is a simple way to get there without having to go into all the details.

 

I should have good file backups, so perhaps I’ll revert the whole 18XX project directory that way, hoping that the full git status is included.

 

Erik.

 

From: Dr....@t-... [mailto:Dr....@t-...] 
Sent: Wednesday, October 23, 2013 3:57 PM
To: Erik Vos
Subject: Re: [Rails-devel] 1880 and 1846

 

What merge conflicts /errors do you have trying to do what exactly ?