This repository was created for a training session of DIME Analytics Intro to Git and GitHub Training - Contributor. You can read more about DIME Analytics Git and GitHub trainings here.
This training targets both absolute beginners and people with some Git/GitHub experience who want to learn best practices for contributing to a project using Git/GitHub. This training will not teach you everything about Git and GitHub, but after this training you will know how to contribute to a repository.
The training is designed for someone joining a team that is already using Git/GitHub, or that is about to start, and has a team member that is experience with GitHub workflows. This training will not teach you how to create a repository, how to set up work flows and best practices for a team using Git/GitHub, or how to solve conflicts etc. in a repository. However, you will be able to figure out most of them yourself after this training, if you are willing to use Google a little bit.
We hope you like Git as much as we do!
While Git/GitHub is a tool primarily for code development, there will be no code during this training. In our experience, code distracts participants (as they want to find out what it is trying to do), and the training applies regardless of intended programming language. So this training is 100% programming language agnostic and has no requirement of coding skills.
Instead we will create an archive of great song lyrics. We will add lyrics to this repository in .txt files. We use that file format as it will behave the same way as any code file, but without distracting us.
Slides. Go to the latex-slides folder to find the LaTeX code used to generate the slides used in this training. Read more about LaTeX in our LaTeX guidelines.
- Clone the repo to the right Github path
- Create a new branch (name it with the purpose)
- Everyone creates a branch from this new branch
- 2 people try to edit the same file (one in the same line, another in a different section). The others add a new file. One person adds a catalog file.
- Commit changes, check the syntax of the commit
- Merge branches to the branch created in step 2, see what happens
- Resolve Merge Conflicts, set "approval"
- merge back to then develop
- Misc: Placeholder files, .git ignore, "hosted in repo", admin rights