├── LICENSE └── README.md /LICENSE: -------------------------------------------------------------------------------- 1 | MIT License 2 | 3 | Copyright (c) 2019 Antoine Caron 4 | 5 | Permission is hereby granted, free of charge, to any person obtaining a copy 6 | of this software and associated documentation files (the "Software"), to deal 7 | in the Software without restriction, including without limitation the rights 8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 9 | copies of the Software, and to permit persons to whom the Software is 10 | furnished to do so, subject to the following conditions: 11 | 12 | The above copyright notice and this permission notice shall be included in all 13 | copies or substantial portions of the Software. 14 | 15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 21 | SOFTWARE. 22 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # Git Kata, learn how to use git in team 2 | 3 | ![license](https://img.shields.io/github/license/Slashgear/git-kata.svg) 4 | ![stars](https://img.shields.io/github/stars/Slashgear/git-kata.svg?style=social) 5 | ![fork me](https://img.shields.io/github/forks/Slashgear/git-kata.svg?style=social) 6 | 7 | When you know the bases of git but sometimes you have problemes with it. This "code kata" could help you to deal with git problems 8 | 9 | | Duration | 2h30 | 10 | |-----------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| 11 | | Supplies needed | - (optional) Story Cubes - video projector - internet | 12 | | Max participant | Team of 4, max 12 people | 13 | | Required skills | The objective of this workshop is to sharpen the use of git in teams in order to limit the everyday problems that can be encountered with Git (interdependence, conflicts,...) | 14 | 15 | ## If you are a *kata participant*, follow these instructions 16 | 17 | * One of the _Dev team_ member should create an empty repository and share the url to the other members 18 | * Make sure *each participant* have the possibility to commit and merge commit on this repository 19 | * The repository should be *empty* 20 | 21 | ## If you are the *the workshop facilitator* 22 | 23 |
24 | SPOIL SPOIL Click here, don't spoil yourself if you are attendant SPOIL SPOIL 25 | 26 | ### As a facilitator, your role will be to accompany the teams during the 2h30 workshop. 27 | 28 | You need to: 29 | 30 | * an internet connection 31 | * a video projector 32 | * (optional) [Story cubes](https://fr.asmodee.com/fr/games/story-cubes/) 33 | 34 | ## Step 1: Explain the rules 35 | 36 | **READ** 37 | *As a team you will have to write a story. Each participant will have to write 2 sentences. 38 | You have 5 minutes to agree on the story to tell and share who should write which part. 39 | You should not talk about how you will organize yourself on the repository. (You can use _Story cubes_ to generate the story) 40 | I must be able to find the author of each sentence. 41 | The story must be consistent and respect the concordance of time.* 42 | 43 | 44 | ## Step 2: Split the team 45 | 46 | Make sure that the participants of the same team are positioned as far as possible in the room. They must not see what is displayed on their colleague's PC. 47 | 48 | **READ** 49 | *You must not communicate with others by any means. You can only communicate through the Github interface.* 50 | 51 | ## Step 3: Simmer for a maximum of 45 minutes 52 | 53 | Let them do as they can for a maximum of 45 minutes. They should normally encounter several problems. 54 | If the team is doing well, introduce a new rule after 20 minutes. 55 | 56 | **READ** 57 | *You must write a back cover in another file* 58 | 59 | Take notes on what went wrong. 60 | 61 | ## Step 4: Debrief with the team 62 | 63 | You must look at the branches of the git tree. Talk about the problems encountered. 64 | 65 | Let the team propose methods that would avoid worries. If the team has no ideas, suggest your ideas. 66 | 67 | - Always start on a branch 68 | - Use PR to let your friend read your content 69 | - Use Merge, Rebase 70 | 71 | 72 | ## Step 5: Starting from the beginning, this time it's the right one. 73 | 74 | All in the title. 75 |
76 | 77 | ## Feel free to share your feedback on the workshop in an issue. 78 | 79 | - Any idea :bulb: 80 | - Need help ? 81 | --------------------------------------------------------------------------------