https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/index.html In this chapter we will learn how to set up a GitHub repo for team collaboration, add collaborators, use issues to administer tasks, contribute code through branches, review contributions and handle merge conflicts. Hugo en-us Mon, 31 Oct 2022 11:31:00 +0100 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/optional-recap/index.html Mon, 31 Oct 2022 11:31:00 +0100 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/optional-recap/index.html In a typical Git + GitHub workflow, you’ll have have your work in a folder (repository) on your local computer and also a linked copy on a remote repository (origin), in this case GitHub. You can make changes in your local repository (most common) or your remote repository. To synch the remote repository with local changes you Push. https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/00-intro/index.html Thu, 20 May 2021 12:51:43 +0300 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/00-intro/index.html In this chapter we’ll move on to a more advanced but far more realistic collaborative workflow where contributions are made by team mates that are all collaborators on the same repository. We’ll be: working in branches off the main branch (similar to forks but internal to the repository). pull requests to contribute code back to the main branch employing code review of pull requests deploying continuous integration to run automatic tests and checks on pull requests practicing resolving code conflicts between pull requests. GitHub Workflow Branching is a core concept in Git. There’s only one rule: anything in the main branch is always deployable (i.e. it works!). https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/01-team-repo-template/index.html Thu, 13 May 2021 17:57:41 +0300 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/01-team-repo-template/index.html Team formation For this chapter, we’re going to be working in groups of 3-4 participants. I’m going to allocate these groups randomly by sending you to break out rooms. Within your break out rooms, you will have 5 mins to introduce yourselves and decide on a group owner. The group owner will: be the main administrator of the project be the one that makes a copy of the template repository will be setting up repository permissions and adding collaborators. will open issues for the rest of the team to work on and assign them to members of the team. will be reviewing the code, merging pull requests and handling merge conflicts. The rest of the team will: be assigned a specific task (issue). create a new branch to work in. follow the instructions in their assigned issue to complete the task in their branch. create a pull request from their branch to the new main branch. make any corrections requested by the owner. Complete team details Once you have decide on a team repo owner, please copy the template provided in the course collaborative notepad and complete your team’s details https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/02-team-repo-configure/index.html Thu, 13 May 2021 17:58:07 +0300 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/02-team-repo-configure/index.html To demonstrate contributions through branches we’ll first start with a small contribution to the python package metadata by the owner. But first, to complete any work on the repo locally, we first need to download the repo to our computers. So let’s go ahead and all do that. Make a local copy of the repository Open GitKraken Client and on the left-hand navigation bar, click on Clone a repo https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/03-resolve-issues-in-branches/index.html Thu, 13 May 2021 17:58:45 +0300 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/03-resolve-issues-in-branches/index.html A powerful tool for keeping track of tasks, enhancements, and bugs for your projects is the issues feature of GitHub. You can access the issues associated with a repository through the Issues tab. They allow storing conversations about tasks in the project repository, visible to the whole team throughout the life cycle of the project, rather that them being buried in hard to navigate email chains! 💯 It’s also easy to see the status of tasks as issues can be closed when completed, leaving the tasks still pending visible by default. https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/04-review-1st-pull-requests/index.html Thu, 13 May 2021 17:59:21 +0300 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/04-review-1st-pull-requests/index.html As the owner, it’s time to review the Pull Requests the rest of your team mates have opened. We’ve actually snuck some errors into the instructions we provided in your team mates issues. The PR review stage provides opportunity for any problems to be identified and dealt with before merging. Let’s use the first pull request made to the repo as an example. In this case, it was made by team mate bobturneruk, tackling issue #2 Add subtraction function via pull request #5. https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/05-review-2nd-pull-request/index.html Fri, 21 May 2021 16:16:40 +0300 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/05-review-2nd-pull-request/index.html Review 2nd Pull Request Next I’ll move onto merging the second pull request. Just like the previous one, I first inspect the checks and code contributed and request modifications to any errors I’ve noted until all checks are passing. Example: Merge in the divide Pull Request. In this example, I’m merging my team mate robadob’s contribution who worked on adding a division function (issue #4 Add subtraction function via pull request #7. https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/06-sync-local-repo/index.html Sat, 22 May 2021 13:27:33 +0300 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/06-sync-local-repo/index.html Now, let’s take a minute and go back to GitKraken Client to inspect what the repo looks like from the ground. Right at the top of the commit graph you should see origin main ahead of all other branches and now containing all the commits made by the entire team. You should see the local branch you used to make your contributions in below, and likely still checked out (indicated by the on the branch label). https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/06-appendix/index.html Wed, 19 May 2021 12:11:18 +0300 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/04-collaborative_github_advanced/06-appendix/index.html Correct Pull Requests subtract There should be changes to 3 files, 2 of which should be new files in the correct location. pythoncalculator/subtract.py There should be a new pythoncalculator/subtract.py containing: