-
Notifications
You must be signed in to change notification settings - Fork 5
Open
Description
π νλ‘μ νΈ μμ μ main λΈλμΉ μ΅μ ν μλ΄
νλ‘μ νΈ μμ μ μ λ°λμ main λΈλμΉμμ λ³κ²½μ¬νμ pull λ°μμ£ΌμΈμ.
μ΄λ² λ³κ²½μλ settings.py, manage.py λ° SQL κ΄λ ¨ μ½λ μμ μ΄ ν¬ν¨λμ΄ μμ΅λλ€.
β μ§ν λ°©λ²
- git checkout develop
- git fetch origin develop
- git pull origin develop
- git checkout 000 (μκΈ° λΈλ μΉ)
- git merge develop
merge μ€ μΆ©λ(conflict)μ΄ λ°μνλ©΄ λ°λ‘ 곡μ ν΄μ£ΌμΈμ.
μμ μμ μ μ κΌ ν λ²μ© μ΅μ ν λΆνλ립λλ€ π
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
No labels