TeamIntroduction

스파르타 코딩 팀소개 팀과제

컨벤션

• 공통 - 모든 Swift 코드에서 준수해야 하는 컨벤션입니다.
• UIKit - Swiftui 코드에서 준수해야 하는 컨벤션입니다.

🐈‍⬛ Git

1️⃣ Git branching Strategy

• Origin(main branch)

• Origin(dev branch)

• Local(feature branch)

• Branch

• Main

• Dev

• Feature

• Fix

• 방법

• 1. Pull the Dev branch of the Origin
• 2. Make a Feature branch in the Local area
• 3. Developed by Feature branch
• 4. Push the Feature from Local to Origin
• 5. Send a pull request from the origin's Feature to the Origin's Dev
• 6. In Origin Dev, resolve conflict and merge
• 7. Fetch and rebase Origin Dev from Local Dev