Skip to content

πŸ”” ν”„λ‘œμ νŠΈ μ‹œμž‘ μ „ μ„ΈνŒ…Β #1

@sua-725

Description

@sua-725

πŸ”” ν”„λ‘œμ νŠΈ μ‹œμž‘ μ „ main 브랜치 μ΅œμ‹ ν™” μ•ˆλ‚΄

ν”„λ‘œμ νŠΈ μ‹œμž‘ 전에 λ°˜λ“œμ‹œ main λΈŒλžœμΉ˜μ—μ„œ 변경사항을 pull λ°›μ•„μ£Όμ„Έμš”.
이번 λ³€κ²½μ—λŠ” settings.py, manage.py 및 SQL κ΄€λ ¨ μ½”λ“œ μˆ˜μ •μ΄ ν¬ν•¨λ˜μ–΄ μžˆμŠ΅λ‹ˆλ‹€.

βœ… μ§„ν–‰ 방법

  1. git checkout develop
  2. git fetch origin develop
  3. git pull origin develop
  4. git checkout 000 (자기 브렌치)
  5. git merge develop

⚠️ μ£Όμ˜μ‚¬ν•­

merge 쀑 좩돌(conflict)이 λ°œμƒν•˜λ©΄ λ°”λ‘œ κ³΅μœ ν•΄μ£Όμ„Έμš”.

μž‘μ—… μ‹œμž‘ 전에 κΌ­ ν•œ λ²ˆμ”© μ΅œμ‹ ν™” λΆ€νƒλ“œλ¦½λ‹ˆλ‹€ πŸ™

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions