Re: [josm-dev] How does merging exactly work ?

2010-03-25 Thread colliar
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 I also wonder that I get a lot more conflicts merging two files with tested than I do get with latest right now. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEAREIAAYFAkurKlwACgkQalWTFLzqsCsrmACdFxsJkYptVpQRNzR9s9kC545m udgAoIW

[josm-dev] How does merging exactly work ?

2010-03-18 Thread colliar
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 I was wondering if the order is important when merging 2 layers ? or is it only used to tell which layer-name is kept ? Regarding #4663 this is quite interesting right now. Anyway I am only offered one layer-name when merging 2 layers. This used to