Github and Website Workshop/git-partner-programming
Welcome to the the seventh step 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 looking at your website and helping you work on it.
Push your code
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.
First let's discuss a few concepts related to this push command:
- 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 origin.
- 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 master - the master branch (ruler of them all)
- To send all your changes to the master branch on the remote server, type git push origin master. 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!
Now go to the repository on Github.com and take a look at your changes there!
Clone someone else's code
Earlier, you put your repository from Github into a folder on your computer.
See if you can follow the same steps to put your partner's repository in another folder on your computer.
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)
Edit each other's code
Talk with each and talk about things you'd think could be better. Change anything you like!
Work on this for about 15 minutes.
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.
pull in changes
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
Make sure your files are updated, and continue to the next lesson.
Feel free to continue to contribute to each other's websites (using push and pull)!