https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/index.html In this Chapter we’ll be exploring how to clone (copy) other people’s repositories from GitHub and contribute content back as well as how to sync local repositories with upstream changes. Hugo en-us Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/01-collaborating-intro/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/01-collaborating-intro/index.html So far, we’ve learnt how to create repositories, commit files, and push/pull the files to a remote source like GitHub. Here we’ll practice collaborating with someone else. Forking, cloning, and pull requests If your code is online on GitHub and has an open licence, anyone can fork to make a separate copy of your repository, clone their fork to create a local copy on their computer it and work on it. https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/02-evolottery-intro/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/02-evolottery-intro/index.html Welcome to the evolutionary lottery of skull and beak morphology Beak and skull shapes in birds of prey (“raptors”) are strongly coupled and largely controlled by size. Bright, J.A., Marugan-Lobon, J., Cobb, S.N. et al. (1 more author) (2016) The shapes of bird beaks are highly controlled by nondietary factors. PNAS, 113 (19). pp. 5352-5357. gif provided by Dr Jen Bright https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/03-fork/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/03-fork/index.html Fork a repository on GitHub Navigate to the repository https://GitHub.com/RSE-Sheffield/collaborative_GitHub_exercise Fork the repository Make your own copy of the repository on GitHub. Forks are linked and traceable https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/04-clone/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/04-clone/index.html Clone a repository using GitKraken Client Clone your fork Now that you have a fork in your account, let’s clone it (ie download a local copy) through GitKraken Client. To start clonining, go to: File > Clone Repo In the Clone panel, select GitHub.com from the source panel. The right-side panel allows you to define the final details of the clone: https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/05-make-changes/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/05-make-changes/index.html Make a change to the repository For this exercise each participant will create a single new file, setting a few parameters to values of their choice, in their fork. We will then collate everyone’s files in the original repository through pull requests. The params/ folder is where we are going to gather our individual parameter files. Currently, it just contains a .R template file called params_tmpl.R. Please DO NOT EDIT this file. We will make a copy of this file to edit. https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/06-commit-changes/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/06-commit-changes/index.html Commit changes locally to git In GitKraken Client, stage the new file you created Moving back to GitKraken Client you should now see that there is one file containing changes and that it is the new parameters file you just created. To add (stage) this file to the commit we are about to make, click on the Stage File button next to the name of the file. Please ONLY STAGE YOUR NEW FILE (ie if for any reason you’ve accidentally edited any other file in the repo, please do not stage it). https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/07-push-changes/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/07-push-changes/index.html Push changes to your fork GitHub Now that you have made the commit, you now see the details of that commit in the right hand panel. To push the commit to your fork on GitHub, click on the Push ⇧ button. Your changes have now been updated in your GitHub repo! https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/08-make-pull-request/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/08-make-pull-request/index.html Make a pull request to the upstream repository The changes you made locally have now been committed and pushed to your fork on GitHub. If you go to GitHub, you’ll now be able to see the details of the last commit. However, we want to collect all participants’ files in the upstream repository ie RSE-Sheffield/collaborative_github_exercise. So the next step is to make a pull request from your fork to the upstream repository. https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/09-merge-pull-request/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/09-merge-pull-request/index.html Response from the upstream repo owners Once a PR is made, it isn’t automatically accepted. The repository owner doesn’t have to accept it, and they might even ask for changes or refuse it outright if the pull request has errors or doesn’t suit them for some reason. The owner of the upstream repository now has the opportunity to digest your pull request through a variety of tools. https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/10-inspect-merged-changes/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/10-inspect-merged-changes/index.html Inspect your changes in the upstream repository You can now check the upstream repository to see your merged changes. The root of the repository indicates that the last commit was the merge of your pull request into the master branch: Navigating to the params/ folder, you should now see the params file you created with your original commit associated with it! https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/11-another-way-to-collaborate/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/11-another-way-to-collaborate/index.html 👉 Give someone repository access rights! If you are working in a team with others you trust, you can edit repository settings so everyone who is working on the code can make commits directly to the same repository. This means they will not have to make a fork, but will instead be able to just clone the repository and push changes back to it as if it was their own https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/12-pull-upstream-changes/index.html Mon, 01 Jan 0001 00:00:00 +0000 https://deploy-preview-149--peppy-otter-7a55ad.netlify.app/03-collaborative_github_basics/12-pull-upstream-changes/index.html Now that everyone has contributed to the RSE-Sheffield repository (the upstream repository), the params/ folder contains a number of files, one for each successful pull request. This is also clear form the commit locator However your local copy of the repository only contains the template and your own file. Q: How can I merge changes from the upstream repository to my local repository? GitKraken Client makes it really simple. Add the Upstream Remote repository On the left side menu bar, hover over the REMOTE menu until a small button appears.