Re: [Maposmatic-dev] Back to MapOSmatic

2015-03-25 Thread Maxime Petazzoni
Try: git stash git pull --rebase git stash pop * Maël REBOUX mael.reb...@breizhpositive.com [2015-03-24 22:17:29]: Le 24 mars 2015 à 16:27, Maxime Petazzoni maxime.petazz...@bulix.org a écrit : * Maël REBOUX mael.reb...@breizhpositive.com [2015-03-23 23:11:37]: Hello. Back

Re: [Maposmatic-dev] Back to MapOSmatic

2015-03-24 Thread Maxime Petazzoni
* Maël REBOUX mael.reb...@breizhpositive.com [2015-03-23 23:11:37]: Hello. Back to MapOSmatic 2 years after the initial project of breton langage city map… First (stupid) question : how to know the version of OCitySMap ? Installed in 2012 on my VM. We don't really version things. We

Re: [Maposmatic-dev] Back to MapOSmatic

2015-03-24 Thread Maël REBOUX
Le 24 mars 2015 à 16:27, Maxime Petazzoni maxime.petazz...@bulix.org a écrit : * Maël REBOUX mael.reb...@breizhpositive.com [2015-03-23 23:11:37]: Hello. Back to MapOSmatic 2 years after the initial project of breton langage city map… First (stupid) question : how to know the version