Partner A
- Fork & clone this repo
- Add partner B as a collaborator
Partner B
- Clone the repo from Partner A
- Add index.html
- Commit
- Push
Partner A
- Pull down changes from Partner B
Both partners:
- Create a branch (git checkout -b)
- Add an index.html file and a line of html
- Commit
- Push to your branch (git push origin branchname)
- Read the GitHub guide
Both partners:
- On the same screen, create pull requests to compare your branches with the master branch
- Analyze conflicts, if it's all good merge with Master
- Pull changes to your branch from master (git pull origin master)
- Switch to the master branch (git checkout master)
- Pull changes from master to your local master branch