Phase 1
Starting the work
‹ Back
Next ›
Replay
← → to step · 1 / 2 jump phase · R replays · F fullscreen
Step
0
/
6
Github Repository
github.com/username/reponame
github.com/craigm/projectX
GitHub
Primary Owner of Repo
DeveloperA
DeveloperB
git clone
git clone
Add Collaborators
- developerA
- developerB
git init
Clone creates directory/folder:
c:/.../learntocode/projectx
local git repo
local git repo
lock main branch
main
home-page
main
main
git branch home-page
git checkout home-page
1
2
2
3
home-page
4
git push
OR
git push -u origin home-page
remote: origin
posts-page
posts-page
5
6
Clone creates directory/folder:
c:/.../learntocode/projectx
Github Repository
github.com/username/reponame
github.com/craigm/projectX
GitHub
Primary Owner of Repo
DeveloperA
DeveloperB
local git repo
local git repo
main
home-page
origin/main
origin/main
home-page
remote: origin
posts-page
posts-page
1
git checkout home-page
git pull origin main
No Updates?
Then No Conflicts
if you are the first to
complete a feature
2
git push or git push origin/home-page
Pull Request
3
create pull request on Github.com
Merge Pull Request
4
5
8
git push or git push origin posts-page
6
git checkout posts-page
git pull origin main
Conflicts
Use Merge Tool
7
git add .
git commit -m "main merged into feature"
Pull Request
9
create pull request on Github.com
Merge Pull Request
merge
fetch
git pull origin main =
git fetch origin main
git merge origin/main
fetch
10
merge