2026-01-24

git pull로 최신 내용 받기

원격 변경을 가져오는 pull 기본 흐름을 정리합니다.

Rhio Kim

Rhio Kim

CEO

#git#pull

Page reactions

Leave a quick reaction to this shorts.

반응을 불러오는 중...

!!steps

!duration 180.0

!

_10
# 로컬 작업 전 원격 저장소와 동기화 상태 확인
_10
$ git status
_10
On branch main
_10
Your branch is up to date with 'origin/main'.
_10
_10
nothing to commit, working tree clean

!!steps

!duration 240.0

!

_12
# 원격 저장소의 최신 변경사항을 로컬에 병합
_12
$ git pull origin main
_12
remote: Enumerating objects: 5, done.
_12
remote: Counting objects: 100% (5/5), done.
_12
remote: Compressing objects: 100% (2/2), done.
_12
Unpacking objects: 100% (3/3), 284 bytes | 284.00 KiB/s, done.
_12
From https://github.com/username/repository
_12
fe5b5e0..6f3e247 main -> origin/main
_12
Updating fe5b5e0..6f3e247
_12
Fast-forward
_12
example.txt | 1 +
_12
1 file changed, 1 insertion(+)

!!steps

!duration 300.0

!

_10
# 충돌 발생 시 해결 프로세스
_10
$ git pull origin main
_10
Auto-merging example.txt
_10
CONFLICT (content): Merge conflict in example.txt
_10
Automatic merge failed; fix conflicts and then commit the result.
_10
_10
# 충돌 파일 편집 후
_10
$ git add example.txt
_10
$ git commit -m "Resolve merge conflict"
_10
[main 8a9b1c2] Resolve merge conflict

!!steps

!duration 180.0

!

_10
# 성공적인 병합 후 최종 상태 확인
_10
$ git log --oneline
_10
8a9b1c2 (HEAD -> main) Resolve merge conflict
_10
6f3e247 Update example.txt
_10
abc1234 Add new feature