taconaut/pms-mlx — comment on commit 205e3a3af9172a0a22cc706166706c5fbbf2e786
File:  line 0
By taconaut:

Haven't investigated, but am wondering if someone knows how this will behave. I had changed the project structure to include plugins (actually only started this, it's not ready yet). This implied moving what was at the source of the repo (except the *.md files) to the ps3mediaserver folder and adding another plugins folder (containing default plugins source code) at the root.
While doing the last merge, git didn't 'notice' that e.g. src/main/java/net/pms/messages_fr.properties has been moved to ps3mediaserver/src/main/java/net/pms/messages_fr.properties.
Questions:
- Does anybody know if git has completely lost the reference between those files? I see three possibilities if something changes for one of those files in ps3mediaser/master. 1) It thinks it has been deleted in pms-mlx/master and won't merge it. 2) It adds the files to src/main/java/net/pms/ again. 3) It notices the similarities between the files and merges them with the corresponding ones in my repo. The bets are open.
- Why did it work fine for most of the files but not for these 3 (the deleted ones in this commit)?
- How to link the files from the two repos again if I have to?