- Git 2 I Have Created A Repo And Added You To This Repository On Github You Should Have Received An Invitation To Join T 1 (62.45 KiB) Viewed 25 times
Git 2 I have created a repo and added you to this repository on GitHub. You should have received an invitation to join this repository. The purpose of this assignment is to allow you to clone a repository, create a branch from this repository, make changes to an existing file and push your changes to GitHub. There will be several steps that you must work through. 1. Clone the gitExperiement repository to your local machine. Note, this will pull down the develop branch. 2. All work must be done from the command line, either GitBash if you are on Windows or Terminal or a substitute terminal for Mac and Linux users. 3. Create a new branch to contain your changes. (git checkout -b <Your branch>) This branch should be named ReadMe<Your name>. 4. Modify ReadMe.md to put your name as the name for Developer. This must stay a true text file so do not modify with Word, TextEdit or other tools that do not save as a text file. Atom from http://atom.io will modify as a text file or you can use your IDE. Do not overwrite other changes. Git fetch and git pull and if necessary, git merge develop. Gets the latest changes and will help avoid merge conflicts. 5. 6. Provide a screen shot of git status. 7. Add your change. Provide a screen shot of git status. 8. 9. Commit and push your change. Ensure you have a meaningful commit message. Create a pull request for your change, note: you will probably have merge conflicts on this. Continue working until you resolve these conflicts. You should go back to your local environment, do a git fetch, git pull and merge or rebase against develop. Modify your Readme.md to add your name as an additional developer. Do not delete the other developers when fixing this merge conflict. This may take multiple attempts. 10. Have someone on your team merge your pull request. Do not delete the branch. When you are merging the pull request, if you get a message that there are merge conflicts, do not merge but notify your teammate they need to fix the merge conflicts. Everyone should only merge one pull request. 11. Switch back to develop and fetch and pull. 12. Create a new branch, hello<Your name>. 13. Open your IDE and write Hello <Your Name>. This class should simply print hello followed by your name. 14. Commit and push just your Java file. 15. Create a pull request and have one of your teammates merge this change. 16. Remove the branches from your local machine, git branch -D <branch name>. 17. I will clean up GitHub as I grade those branches.