Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[build-server] adding new sims to rosetta fails #2

Closed
aaronsamuel137 opened this issue Oct 21, 2015 · 1 comment
Closed

[build-server] adding new sims to rosetta fails #2

aaronsamuel137 opened this issue Oct 21, 2015 · 1 comment
Assignees
@aaronsamuel137

Comments

@aaronsamuel137
Copy link
Contributor

Most likely caused by running git pull after modifying the simInfoArray file.

error: Your local changes to the following files would be overwritten by merge:
        data/simInfoArray.json
Please, commit your changes or stash them before you can merge.
@aaronsamuel137 aaronsamuel137 self-assigned this Oct 21, 2015
aaronsamuel137 added a commit that referenced this issue Oct 21, 2015
@aaronsamuel137
move git pull in rosetta first, see #2
7a416fe
@aaronsamuel137
Copy link
Contributor Author

Appears to be fixed. Closing

@mattpen mattpen mentioned this issue Apr 25, 2019
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@aaronsamuel137 aaronsamuel137

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@aaronsamuel137