Conversation
(Can't create an empty folder on Github, must have a file in it)
Middle section WIP, need to consider the tasks again;examples missing, but I have them!
|
Hi @feiphoon, the content seems good to me, just not sure whether we should introduce Gist. |
|
At this point, feeling the flow much better. A couple of WIP slides remaining with fragments (marked with a ETA: Self-criticism, I obviously want to keep it a secret from everyone that Git is a version control system :P To-do! |
| - Merge | ||
| 1. **Repository:** a project. | ||
| 2. **Branch:** a collection of changes. | ||
| 3. **Master:** the "default" branch, also the most recent, fully-approved version of the project. |
There was a problem hiding this comment.
Shall we give them an idea of how a good project is set up? I mean master branch, release branch, develop branch, fix branches, ...
There was a problem hiding this comment.
I think we should keep it simple. That is the git flow process I use at kobalt, and it took me a while to get my head around it.
| 2. **Branch:** a collection of changes. | ||
| 3. **Master:** the "default" branch, also the most recent, fully-approved version of the project. | ||
| 4. **Commit:** a saved change on a branch. So branches are groups of changes with a common objective. | ||
| 5. **Pull request (PR)**: a request to add your branch of changes to `master`. |
There was a problem hiding this comment.
You can't do a PR to a branch different from master?
There was a problem hiding this comment.
Of course! But let's keep it simple for beginners & head straight for our learning objectives - this will get them where they need to be. Delving into git branching is intermediate level.
| 3. **Master:** the "default" branch, also the most recent, fully-approved version of the project. | ||
| 4. **Commit:** a saved change on a branch. So branches are groups of changes with a common objective. | ||
| 5. **Pull request (PR)**: a request to add your branch of changes to `master`. | ||
| 6. **Merge**: the action that accepts your branch into the master branch. |
There was a problem hiding this comment.
As before, it cannot be just a generic that accepts your branch into another branch? Or a remote branch (but not sure if GH IU has concepts like local/remote.
There was a problem hiding this comment.
As before about branching :) We are using Github web UI because local/remote (as with push/pull/fetch) are additional concepts, and we cover that later.
| --- | ||
| # Workshop Time | ||
|
|
||
| See: https://github.com/feiphoon/github-workshop/ |
There was a problem hiding this comment.
Shall we link directly to the github.io project's pages?
There was a problem hiding this comment.
I think we should focus on getting an MVP out - we need time to show our support team/tutors what they need to revise, plus I have another project to finish before Sunday. There's no reason why the markdown files won't be fine to use as they are - they're formatted nicely and accessible. Can we leave the transfer to Pages as a last enhancement and a nice-to-have? Changing this link will be part of that.
|
That's what the git flow process is :) No, I wouldn't go into that at this
point. I'm only mentioning it at the end as a variation on Git
collaboration that is for code that has to be deployed in releases :)
|
Ester-Ramos
left a comment
There was a problem hiding this comment.
I think it's good. We should merge this and make more changes later if needed.
| ###### *26/02/2019* | ||
|
|
||
| --- | ||
| For Alessia, if you need a slide or two? |
There was a problem hiding this comment.
I'm done with my part! I intended to upload two versions - darker & lighter to compare, but it seems that the formatting on the lighter/basic template has failed (it gets even more shambolic after uploading to SpeakerDeck). I will probably delete it.
You can preview the presentation here: https://speakerdeck.com/monkeyfruit/github-for-collaborative-datasci-and-dataeng
|
Too late, I had already branched out of |
A work in progress, but opening now to keep my team in the loop.
Todo:
<!-- Speaker notes test -->To preview this in the absence of the generated PDF, either check it in a markdown previewer (and Atom has a package), or download Marp (https://yhatt.github.io/marp/) and open file in it.
Update: Available here for its near-final form https://speakerdeck.com/monkeyfruit/github-for-collaborative-datasci-and-dataeng