[orion-dev] git merge and corrupted users.xml

[Susan Franklin McCourt <susan_franklin@xxxxxxxxxx>]

This might be obvious to everyone else, but in case it's not:

Yesterday after pulling the latest server code, I got stuck for a few minutes by an "Internal error while authentication" error.
At first I thought it was a bug in the code I'd just pulled, but I realized that it's caused by an inappropriate merging of the users.xml file when pulling the code.
The pattern that got me into trouble was:

- git pull (fails because the users.xml is changed)
- git stash
- git pull
- git stash pop

The merging that happens here produces the problem, and you must fix your users.xml and stop/restart the server to recover.

I added a .gitignore file (and will likely do the same for the client launch configs) but of course then I'll miss legitimate changes to those files.

What is everyone else doing?

susan