shandy79
commented
4 years ago Alex, not sure why there are changes from the docs branch, but I agree that those will likely need to be re-written to match the actual docs branch updates. I can take care of that with either a new PR for docs or after you merge docs to master. As for the .pyc files, I actually removed those, which had been in the project for quite a while. The revert of a revert is annoying for sure. I followed the recommended procedure for dealing with that such that there is a little extra clutter in the history, but HEAD should basically be where we want it to. If you know some fancier tricks to get that more to your liking, please feel free to experiment! I'm still not sure what I did to cause that mess in the first place, as I don't know why I would have clicked the Merge button at any point. Finally, I don't have any concerns about the .aes file and I'll send you the SECURE_STORE_PASSWORD through Slack for your local usage.
neksa
I'm slightly worried that changes in docs/motifs may overwrite changes in the recently merged pull request
also, I noticed a few *.pyc files that were added by accident
I think I see what you meant by 'revert 'revert commit'', would you be able to squash these commits? or is it too late and it's been merged last time?
I assume it is fine to keep .aes file in the repository because it's encrypted and password for decryption is passed via the testing environment.
developer instructions are detailed and pretty clear - thanks a lot for that!