When trying to switch between dev and master branches I get this error:
error: Your local changes to the following files would be overwritten by checkout:
res/libsodium.a
Please commit your changes or stash them before you switch branches.
Aborting
I don't think this generated file should be in version control, it seems it was added by accident long ago.
When trying to switch between dev and master branches I get this error:
```
error: Your local changes to the following files would be overwritten by checkout:
res/libsodium.a
Please commit your changes or stash them before you switch branches.
Aborting
```
I don't think this generated file should be in version control, it seems it was added by accident long ago.
Agreed. I think I had problems with the previous version that was originally comitted when trying to cross-compile for Windows. I may have had to delete it for the build process to generate a new one. I ended up committing a newer generated version then but it shouldn't be in version control.
Agreed. I think I had problems with the previous version that was originally comitted when trying to cross-compile for Windows. I may have had to delete it for the build process to generate a new one. I ended up committing a newer generated version then but it shouldn't be in version control.
When trying to switch between dev and master branches I get this error:
I don't think this generated file should be in version control, it seems it was added by accident long ago.
Agreed. I think I had problems with the previous version that was originally comitted when trying to cross-compile for Windows. I may have had to delete it for the build process to generate a new one. I ended up committing a newer generated version then but it shouldn't be in version control.
ok, deleted from git on the
dev
branch