CSE4006: Software Engineering: Lab 2: Git
CSE4006: Software Engineering: Lab 2: Git
Lab 2: Git
Software Engineering Lab
Except where otherwise noted, the contents of this document are Copyright 2017 Gayeon Kim, Gwanggyu Choi,
Youn-geun Ahn and Scott Uk-Jin Lee All rights reserved. Any redistribution, reproduction, transmission, or
storage of part or all of the contents in any form is prohibited without author’s expressed written permission.
Review
Git Basic Workflow
git add git commit git push
git init
Local Remote
Workspace Staging Area
Repository Repository
Your
Project .git
Local
Staging Area
Repository
Pull me!
My remote Project
Repository Repository
Okay!
Click
Pull Request(My Repo Project Repo)
PM can accept/reject
contributor’s Pull Request
Accept(Merge)
Reject(Close)
Pull Request(Project Repo My Repo)
In my repository
Click
Pull Request(Project Repo My Repo)
Click
When the changes are occur at project repository,
then you need to synchronize your repository and project repository
Pull Request(Project Repo My Repo)
When you click ‘switching the base’, then the pull direction is reversed.
(From Project Repository to My Repository)
Exercise 1
1. Fork or Pull TA’s repository to your remote repository
(https://github.com/SELab2017/SE2017.git)
kim HELLO
ahn hello
kim HELLO
ahn hello
working…
kim HELLO Conflict HELLO
Solve Conflict
(select hello or HELLO)
Fix here!
Remain ‘This line is added from my PC’
or ‘This line is added from GitHub’