Once the merge is complete, your local master will now be showing as synched with the RSE-Sheffield remoteĪnd you will have copies of all the files contributed in your params/ folder! □ Find out more about fast-forward git merging. That ensures that you do not create a circular commit of your initial commit to the upstream repo when you are merging it back into your local repo. Select Fast-forward master to RSE-Sheffield/master. Once you drop it onto the local master branch successfully, a pop up menu will appear. To pull the upstream changes from the RSE-Sheffield repository, grab the RSE-Sheffield button from the history panel and drag it over to your local master branch until a icon appears next to it and drop. Once added, the RSE-Sheffield repository will be visible under the REMOTE menu Select the RSE-Sheffield/collaborative_github_exercise repository from the GitHub Repo dropdown menu and click the On the left side menu bar, hover over the REMOTE menu until a small Q: How can I merge changes from the upstream repository to my local repository? However your local copy of the repository only contains the template and your own file. This is also clear form the commit locator 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. Review 2nd Pull Request: handling merge conflicts Review 1st Pull Request: asking for corrections Cloning and Collaborating with GitKraken Client
0 Comments
Leave a Reply. |