Create a Pull Request and merge your code

Let's create pull request to merge our work into 'master'.

1. In Chrome, navigate to your "MyFirstRepo" page. Click on the button next to your selected branch labeled New pull request.

2. Under Compare changes, use the right dropdown menu to select 'cocktails-branch'.

3. Your view will switch to Open a pull request. Scroll down to the bottom of the page to see a diff of changes. Press the green Create pull request button.

4. Click the arrow next to the green Merge pull request button and select Squash and merge. The button changes to Squash and merge. Click the button.

5. All your commit message display in the text input for you. Click Confirm squash and merge button to merge your changes.

6. Click the Code tab at the top of the page to navigate back to your code. Click on cocktails.txt to see your changes from 'cocktails-branch' in 'master'.

7. Open your terminal and navigate to your "MyFirstRepo" folder in "CodingAndCocktails/session3" folder.

8. Change branches to 'master' by typing git checkout master .

9. Pull down the latest changes by typing git pull .

Fork a buddy's repo

1. Find a Coding & Cocktails buddy's GitHub repo. Reach out on Slack if you need to. Using Chrome, navigate to their "MyFirstRepo" page.

2. Find the Fork button in the upper right corner of the page and click on it.

   

   If asked, “Where should we fork this repository?” Select your personal profile. This question indicates you're a part of a GitHub organization but we want to use our personal accounts this evening. If you are not asked that question, carry on.

3. In your terminal, navigate to "CodingAndCocktails/session3" folder in your home directory. If you are already in "MyFirstRepo", you can type cd .. .

4. GitHub will automatically add a "-1" to the name of the repository so that repository names are unique. Once the fork completes, GitHub navigates to your fork. Click on the green clone button to get the link to clone the fork to your machine.

   Need a little help? Expand this section for guidance.

   Type git clone and paste the link .

5. Navigate into "MyFirstRepo-1" and create a new branch using your username and add "-branch" after it. In our example, user "ladydev" will create "ladydev-branch".

   Need a little help? Expand this section for guidance.

   Type git checkout -b ladydev-branch .

6. In the newly created branch, create a new file named using your name, such as "ladydev.txt". Add the message "Hello fellow ladydev!". Feel free to use your favorite text editor or in Atom.

7. In the terminal, add, stage, and commit your file. Add a friendly commit message.

   Need a little help? Expand this section for guidance.

   Type git add ladydev.txt .
   Type git commit -m "friendly commit message here" .

8. Push your changes and branch.

   Need a little help? Expand this section for guidance.

   Type git push --set-upstream origin branch-name .

9. Create a pull request by clicking the New pull request button.

10. This time when comparing branches you're comparing against forks. We want the changes from our branch to migrate to your buddy's master branch so select your newly created branch in the right-most dropdown.

11. Click the green Create pull request button twice. You created a pull request to make a change to your buddy's repo! Hopefully they merge it in soon!

12. Don't forget to accept your buddy's pull request

    1. To merge in your buddy's pull request, navigate to your "MyFirstRepo" in Chrome. Click on Pull requests to see the pull request. There should be a number after it indicating the number of open pull requests.

    2. Click on a pull request. Click the green Merge pull request button and then click the green Confirm merge button.