Github and Website Workshop/git-partner-programming: Difference between revisions
Content added Content deleted
imported>Auria No edit summary |
imported>Auria No edit summary |
||
| (3 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
Welcome to |
Welcome to Challenge 11 of the [https://openhatch.org/wiki/Github_and_Website_Workshop Github and Website Workshop] - partner up! |
||
==Find a partner== |
==Find a partner== |
||
| Line 6: | Line 5: | ||
It's okay if you don't know them - you're all pretty cool (you're at the workshop, after all). |
It's okay if you don't know them - you're all pretty cool (you're at the workshop, after all). |
||
This partner is going to be |
This partner is going to be helping you implement div.table-row and div.table-cell |
||
== |
==Challenge== |
||
Go through the follow steps with one person as “you” and the other as “partner” |
|||
Right now you have made some commits - but no one else can see these changes yet. To have them show up on GIthub, you need to "push" your code. |
|||
When you’re finished, switch positions and repeat these steps (if you would like to) |
|||
First let's discuss a few concepts related to this push command: |
|||
'''You''' |
|||
* You are putting changes from your computer to the ''remote server''. Usually the remote server, the place on Github where your files can be viewed, is called <tt>origin</tt>. |
|||
* Go to your repository page on GitHub, click “Settings” (on the right-hand side) and select the “Collaborators” tab |
|||
* There is a concept called branching in git which lets you work on multiple changes at the same time. We will not be talking about branches in this workshop, but it helps to know that the ''branch'' you are working on is called <tt>master</tt> - the master branch (ruler of them all) |
|||
* Search and add your partner’s GitHub username |
|||
* To send all your changes to the master branch on the remote server, type <tt>git push origin master</tt>. It's possible that the first time you do this git will ask you for some more information. If this happens please let a mentor know and we'll help you out! |
|||
'''Partner''' |
|||
Now go to the repository on Github.com and take a look at your changes there! |
|||
* In the terminal, run git clone [your partner’s repo] to get a copy of their website code |
|||
* Challenge: style div.table-row and div.table-cell |
|||
** Hint: look at the W3 School’s documentation for the display property |
|||
* Commit and push the changes when you’re ready |
|||
'''You''' |
|||
==Clone someone else's code== |
|||
| ⚫ | |||
| ⚫ | |||
'''Partner''' |
|||
[https://openhatch.org/wiki/Github_and_Website_Workshop/fork_a_template Earlier], you put your repository from Github into a folder on your computer. |
|||
* Challenge: add padding between table-cells (give your partner an undesired value) |
|||
* Commit and push the changes when you’re ready |
|||
'''You''' |
|||
See if you can follow the same steps to put your partner's repository in another folder on your computer. |
|||
* Challenge: add padding between table-cells (use a desired value) |
|||
* Commit and push the changes when you’re ready |
|||
Bam, you will notice that there’s a merge conflict! |
|||
You do NOT need to fork this repository - start after this step. (Fork creates a completely separate copy, and you want their code and their repository on your computer) |
|||
If you refresh portfolio.html, you will notice something along the lines of: |
|||
==Edit each other's code== |
|||
<code> |
|||
Talk with each and talk about things you'd think could be better. Change anything you like! |
|||
<<<<<<< HEAD |
|||
[your change] |
|||
======= |
|||
[partner’s change] |
|||
>>>>>>> master |
|||
</code> |
|||
To resolve the conflict erase “<<<<<<< HEAD”, “=======”, and “>>>>>>> master” and keep erase [partner’s change] |
|||
Work on this for about 15 minutes. |
|||
Try pushing again - conflict solved. |
|||
==commit and push== |
|||
| ⚫ | |||
Commit your code and push it back to the remote server. Now you can bring the changes to your own website back to your own computer. |
|||
[https://openhatch.org/wiki/Github_and_Website_Workshop/footer Next: Challenge 12] |
|||
==pull in changes== |
|||
| ⚫ | |||
| ⚫ | |||
Make sure your files are updated, and continue to the next lesson. |
|||
| ⚫ | |||
Latest revision as of 15:15, 6 March 2015
Welcome to Challenge 11 of the Github and Website Workshop - partner up!
Find a partner
It's okay if you don't know them - you're all pretty cool (you're at the workshop, after all).
This partner is going to be helping you implement div.table-row and div.table-cell
Challenge
Go through the follow steps with one person as “you” and the other as “partner”
When you’re finished, switch positions and repeat these steps (if you would like to)
You
- Go to your repository page on GitHub, click “Settings” (on the right-hand side) and select the “Collaborators” tab
- Search and add your partner’s GitHub username
Partner
- In the terminal, run git clone [your partner’s repo] to get a copy of their website code
- Challenge: style div.table-row and div.table-cell
- Hint: look at the W3 School’s documentation for the display property
- Commit and push the changes when you’re ready
You
- When someone else changes files in a repository, you can update the files on your computer using a command that works somewhat opposite to git push
- Enter this command: git pull in the terminal to get your partner’s changes
Partner
- Challenge: add padding between table-cells (give your partner an undesired value)
- Commit and push the changes when you’re ready
You
- Challenge: add padding between table-cells (use a desired value)
- Commit and push the changes when you’re ready
Bam, you will notice that there’s a merge conflict!
If you refresh portfolio.html, you will notice something along the lines of:
<<<<<<< HEAD
[your change]
=======
[partner’s change]
>>>>>>> master
To resolve the conflict erase “<<<<<<< HEAD”, “=======”, and “>>>>>>> master” and keep erase [partner’s change]
Try pushing again - conflict solved.
Feel free to continue to contribute to each other's websites (using push and pull)!