Resolve "Add functions to generate standard R_x, R_y, R_z rotation matrices as 3x3 numpy arrays." - [merged]
thompson318 opened this issue · 5 comments
In GitLab by @GuofangXiao on Feb 12, 2019, 20:44
Merges 11-generate-rotation-matrices -> master
Removed venv/
Closes #11
In GitLab by @MattClarkson on Feb 12, 2019, 21:30
From the first merge request: "Thanks. However, you've checked in your venv, so we can't merge it. Can you sort it out tomorrow please, and add venv folder to .gitignore. We must make sure not to add this venv folder, as it will make the repo too large."
This means you need to do 2 things.
- You need to remove the venv from history. This hasn't happened yet. For example, its still here
- And you need to add it to .gitignore. I don't think you need double asterisk.
For the first one, you need to:
- Take a copy of your code that you added, including the changes to .gitignore. You should not have committed code and the virtual env in one commit, as now it makes it hard to separate.
- Do a hard reset to a commit before the mistake.
- Force push to remote to fix the history
- Add your code again
In GitLab by @MattClarkson on Feb 13, 2019, 10:17
added 1 commit
In GitLab by @MattClarkson on Feb 13, 2019, 10:20
Yay Fixed!
In GitLab by @MattClarkson on Feb 13, 2019, 11:53
merged
In GitLab by @MattClarkson on Feb 13, 2019, 11:53
mentioned in commit 0e4b0bd