anton/mlpractical
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed errors

Browse Source
This commit is contained in:
Steve Renals 2015-10-06 22:44:07 +01:00
parent ff2940f917
commit e98ed30530
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gitFAQ.md
View File

@ -1,14 +1,16 @@
## How do I get started?
## How do I get started?
Setting up your virtual environment and getting the initial MLP materials is explained in the first part of the first lab, in `00_Introduction.ipynb`
Setting up your virtual environment and getting the initial MLP materials is explained in the first part of the first lab, in `00_Introduction.ipynb`
2. <b>How do I update to this weeks coursework?</b> To avoid potential conflicts between the changes you have made since last week and our additions, we recommend stash your changes and pull the new code from the mlpractical repository by typing:
## How do I update to this weeks coursework?
To avoid potential conflicts between the changes you have made since last week and our additions, we recommend stash your changes and pull the new code from the mlpractical repository by typing:
* git stash save "Lab1 work"
* git pull
Then, if you need to, you can always (temporaily) restore a desired state of the repository.
At any point you can use `git stash list` to print a list of all the current stashes. For example if you have one stash created as above the output would be:
At any point you can use `git stash list` to print a list of all the current stashes. For example if you have one stash created as above the output would be:
```
stash@{0}: On master: Lab 1 work
@ -48,6 +50,10 @@ Again you need to make sure there are not any uncommitted stages on your current
The alternative to creating a separate branch to restore a stash to is to use `git stash apply` or `git stash pop` to merge the stashed changes in to your current branch working copy (apply keeps the stash after applying it while pop removes it from the stash stack). If the stashed changes involve updates to files you have also edited in your current working copy you will most probably end up with merge conflicts you will need to resolve. If you are comfortable doing this feel free to use this approach, however this is not something we will be able to help you with.
3. <b>If I find an error in something in the practical, can a I push a change to correct it?</b> Yes by making a fork, then a pull request. But equally you can make a comment on nb.mit.edu or send email. Again probably not worth bothering with the git way unless you already understand what to do.
## If I find an error in something in the practical, can a I push a change to correct it?
4. <b>What is a good tutorial on git?</b> I like [this concise one from Roger Dudler](http://rogerdudler.github.io/git-guide/) and a [slightly longer one from Atlassian](https://www.atlassian.com/git/tutorials/). There are many others!
Yes by making a fork, then a pull request. But equally you can make a comment on nb.mit.edu or send email. Again probably not worth bothering with the git way unless you already understand what to do.
## What is a good tutorial on git?
I like [this concise one from Roger Dudler](http://rogerdudler.github.io/git-guide/) and a [slightly longer one from Atlassian](https://www.atlassian.com/git/tutorials/). There are many others!