diff --git a/LICENSE b/LICENSE index a937737..3accfc3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,28 @@ -MIT License +BSD 3-Clause License -Copyright (c) 2025 UTS Programmers' Society +Copyright (c) 2025, stevensoup -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index 29f9df9..370d0b5 100644 --- a/README.md +++ b/README.md @@ -1,62 +1 @@ -# git2025 - -## Prerequsites for the Workshop -- [Github Account](https://github.com/signup) -- [Git](https://git-scm.com/downloads) - - On Windows: Make sure you set "Visual Studio Code" as your editor during setup. -- [Visual Studio Code](https://code.visualstudio.com/download?ref=progsoc.org) -- [Github CLI](https://cli.github.com/) - -## Link to Slides -[Google Slides](https://docs.google.com/presentation/d/143PKXZBmfM5mBy-hAxs0ZPwLcT6JNFtqtDF-v8_BnQ8/edit?usp=sharing) - -## Staging Changes - -When using git, there are various stages your files can be in: untracked, modified, staged and committed. - -**Untracked:** New files that have been added to your project directory. - -**Modified:** Files that have been edited since your last commit. - -**Staged:** Files that have been marked as ready to be included in the next commit. - -**Committed:** Changes have been synced with your local git repository. - -**Pushed:** Changes are now synced with the remote repository and all collaborators. - -## Group Work - -Have a go at modifying the sample website. If you haven't used HTML before, use the link below for sample HTML syntax. - - -Ideas: -- Cat Newspaper -- Write some news about Superman - -[W3Schools HTML Example Syntax](https://www.w3schools.com/html/html_examples.asp) - -### Managing Merge Conflicts - -Merge conflicts occur when multiple people make changes to the same lines in a file. -They show you what currently exists and your incoming change and you have to resolve it manually. -Inducing a merge conflict - -To learn how to resolve merge conflicts, we can force a merge conflict manually. -This can be done as a group or individually if you're just following along by yourself. - - -1. 2 People should each create a new branch using `git switch -c` - -2. Both people should stage and commit their changes, ensuring they change the same line in different ways - -3. Both people open a pull request -4. Merge one of the pull requests -5. Trying to merge using gh pr merge for the second branch should now fail. -6. The other person will be shown by GitHub CLI how to solve the merge conflict. -Once it's resolved they'll be able to merge their branch with main! - - -## Additional Resources -- [Pro Git](https://git-scm.com/book/en/v2) -- [Fireship Git Video](https://youtu.be/HkdAHXoRtos) -- [2024 Git Workshop](https://docs.progsoc.org/blog/2024/03/29/intro-to-git-2024/) +https://stevensoup.github.io/teamwang/