[일지] 2026.03.16

김재만·2026년 3월 16일

작업한 것

  • 회사 온보딩(개발 환경 가이드 및 컨벤션 관련)

    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git switch -c feature/local-gi
    t-practice
    Switched to a new branch 'feature/local-git-practice'
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git branch
      feature/add-ci
    * feature/local-git-practice
      main
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % echo "git practice" > practice
    .txt
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git add practice.txt
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git commit -m "feat: add practice file"
    [feature/local-git-practice c13043a] feat: add practice file
     1 file changed, 1 insertion(+)
     create mode 100644 practice.txt
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % echo "wrong change" >> practic
    e.txt
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git restore practice.txt
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git add practice.txt
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % echo "wrong change" >> practice.txt
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git add practice.txt
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git restore --staged practice.
    txt
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git restore practice.txt
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git fetch origin        
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git log origin/main
    commit cbf4a1e9d4307d8255a590f7356f4df5dfd817c6 (origin/main, origin/HEAD, main)
    Merge: f5060dd b3f47c0
    Author: Jaeman Kim <90954655+mannMae@users.noreply.github.com>
    Date:   Sat Mar 14 19:20:21 2026 +0900
    
        Merge pull request #1 from mannMae/feature/add-ci
        
        chore: CI 추가
    
    commit b3f47c0b9efff6753b6d97c26129e4ceecf46116 (origin/feature/add-ci, feature/add-ci)
    Author: mannmae <daga4242@gmail.com>
    Date:   Sat Mar 14 19:19:22 2026 +0900
    
        chore: CI 추가
    
    commit f5060dde316cbad73731592ab4a6685692068117
    Author: mannmae <daga4242@gmail.com>
    Date:   Sat Mar 14 18:46:29 2026 +0900
    
        chore: ONBOARDING.md 추가
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git push origin feature/local-
    git-practice
    Enumerating objects: 4, done.
    Counting objects: 100% (4/4), done.
    Delta compression using up to 14 threads
    Compressing objects: 100% (2/2), done.
    Writing objects: 100% (3/3), 329 bytes | 329.00 KiB/s, done.
    Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
    remote: 
    remote: Create a pull request for 'feature/local-git-practice' on GitHub by visiting:
    remote:      https://github.com/mannMae/tirosh-onboarding/pull/new/feature/local-git-practice
    remote: 
    To https://github.com/mannMae/tirosh-onboarding.git
     * [new branch]      feature/local-git-practice -> feature/local-git-practice
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git checkout main
    Switched to branch 'main'
    Your branch is up to date with 'origin/main'.
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % ls
    ONBOARDING.md
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git fetch origin main
    remote: Enumerating objects: 4, done.
    remote: Counting objects: 100% (4/4), done.
    remote: Compressing objects: 100% (2/2), done.
    remote: Total 3 (delta 0), reused 2 (delta 0), pack-reused 0 (from 0)
    Unpacking objects: 100% (3/3), 991 bytes | 991.00 KiB/s, done.
    From https://github.com/mannMae/tirosh-onboarding
     * branch            main       -> FETCH_HEAD
       cbf4a1e..44579b4  main       -> origin/main
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % echo "wrong contents" >> practice.txt
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git add .
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git commit -m "feat: add wrong contents"
    [main c73df35] feat: add wrong contents
     1 file changed, 1 insertion(+)
    jaemankim@Tiroshui-MacBookPro tirosh-onboarding % git push origin main
    Enumerating objects: 5, done.
    Counting objects: 100% (5/5), done.
    Delta compression using up to 14 threads
    Compressing objects: 100% (2/2), done.
    Writing objects: 100% (3/3), 282 bytes | 282.00 KiB/s, done.
    Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
    remote: Resolving deltas: 100% (1/1), completed with 1 local object.
    remote: error: GH013: Repository rule violations found for refs/heads/main.
    remote: Review all repository rules at https://github.com/mannMae/tirosh-onboarding/rules?ref=refs%2Fheads%2Fmain
    remote: 
    remote: - Changes must be made through a pull request.
    remote: 
    remote: - Required status check "test" is expected.
    remote: 
    To https://github.com/mannMae/tirosh-onboarding.git
     ! [remote rejected] main -> main (push declined due to repository rule violations)
    error: failed to push some refs to 'https://github.com/mannMae/tirosh-onboarding.git'

    • 명령어 테스트
      • git fetch
      • git switch -c
      • git restore
    • main 브랜치 푸쉬 룰 테스트

배운 것

  • git fetch: pull 대신 코드를 병합하지 않고 원격 상태만 수신(병합은 확인 후 선택적)
  • git restore: 로컬 파일 또는 스테이징을 이전 시점으로 되돌리기
  • git switch: 브랜치를 전환하는 것만 한정한 명령어(checkout과 유사)
    • git switch -c ⇒ 크리에이트 = 생성 후 브랜치 변경

다음 작업

  • Issue Driven Development 튜토리얼

마무리

아장아장맨

profile
듣는 것을 좋아하는 개발자입니다

0개의 댓글