gcapes / git-course Goto Github PK
View Code? Open in Web Editor NEWVersion control training course using Git
Home Page: http://gcapes.github.io/git-course/
License: Other
Version control training course using Git
Home Page: http://gcapes.github.io/git-course/
License: Other
In introduction, give very quick overview of git vs SVN if there are people who have previously used SVN.
Lesson just does the rebase but the point is to show what happens when you rebase then merge
The link to the different types of git reset
on line 227 is broken.
[This article](http://git-scm.com/2011/07/11/reset.html) discusses more in
depth `git reset` showing the differences between the three options:
* `--soft`
* `--mixed`
* `--hard`
The ascii diagrams are OK, but a diagram which could be put into a slideshow would be better
Github changed the URL.
Mention that you can release versions with GitHub
Check that:
Example doesn't produce a merge conflict, and that is the intention.
Re-test lesson to make sure examples work. I think there is one step missing somewhere i.e. without telling you what changes to make.
Connection problems can cause freezes, so just side-step this and use the C drive (default home directory for git bash anyway).
Label the commits with their refs
Add sections one at a time to make visualising changes between commits more straightforward.
Collaboration could be a model - measurements comparison.
Put in hints and tips, and link from episode 3 on diff http://stackoverflow.com/questions/6412516/configuring-diff-tool-with-gitconfig
When are we adding the second paper to references?
Already mentioned, but make more obvious that the global config options are effectively a one-time set-up task.
Use PS1="$ " if running Bash so the commands typed are easy to see.
Also use a black-on-white shell profile.
In the remotes lesson, the instructions only pull down the master branch. Add in how to get the other remote branches.
Hopefully improve at-a-glance readability when teaching.
The bio exercise comes a little while after the set-up stage, so maybe asking learners to remember to initialise the repository is asking too much.
A faded example showing what steps need to be done would reduce the cognitive load, while still solidifying the understanding by typing the commands again.
Commit on a detached head, then checkout a new branch to save the changes.
We have already abandoned the changes in the worked examples of the lesson, so let's save the commits this time in a new branch.
R studio in particular because participants have asked about R.
Visualisation would help greatly with the explanations of what these commands do
And link to it from the exercises
Just to make demonstrating easier.
Nano seems to be confusing for those not used to the command line. No need for this extra cognitive load.
Explanation of detached head needs improving and expanding with diagrams
Like
contributing
rebase
when making editsSimply git fetch
then git checkout new_branch
, rather than introducing new syntax
Somewhere in the branching episode, show git log --graph
Have emailed Atlassian to ask for clarification of their diagrams.
In the Commit advice there are mention of file to not follow with git. It is a logical place to mention the .gitignore file which is mention in the hints.
This appears to be the same issue as
microsoft/Git-Credential-Manager-for-Windows#613
(I've run with export GCM_TRACE=1
and the error is the same)
Presumably GCM needs updating on the machines in G11
http://staffnet.manchester.ac.uk/news/display/?id=19679 may be useful
There is a second commit on master for no reason - should be a hot-fix
or merge from develop
.
It's likely to be seldom used, so save time and show a bit more of GitHub instead.
In slideshow too.
See what the default editor is in git bash, if you can set gedit, test for potential problems
This is done by default on my computers, but not on G11 cluster. Required command is:
git config --global --add color.ui true
i.e. it makes it really easy for the repo owner to merge your PR
Not sure where - maybe in hints and tips
In episode 3, line 233, HEAD~
is used to get the parent commit. I don't think this has been introduced at this point, so might be clearer to use the absolute commit id?
Notice how HEAD and master point to the same commit. Now checkout a previous commit again, and look at the graph again. We can display, this time specifying that we want to look at --all the history, rather than just up to the current commit.
$ git checkout HEAD~
$ git log --graph --decorate --oneline --all
A declarative, efficient, and flexible JavaScript library for building user interfaces.
๐ Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. ๐๐๐
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google โค๏ธ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.