Git 충돌 시 (Gitlab)

다른 사람과 수정한 파일이 겹쳐 충돌 났을 때

1. git stash : 임시 저장
2. git pull
3. git stash pop : 임시 저장 불러오기
4. 충돌난 파일 merge

PS C:\software\project\test-ui> git stash
Saved working directory and index state WIP on master: f99f0a5 페이징 컴포넌트 주석추가

PS C:\software\project\test-ui> git stash pop
Auto-merging app/_components/layouts/common/LeftMenu.tsx
Your branch is up to date with 'origin/master'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        new file:   app/(main)/cms/website/instructor_add_course/page.tsx
        new file:   app/(main)/cms/website/instructor_manage/page.tsx
        new file:   app/(main)/cms/website/instructor_manage_detail/page.tsx
        modified:   app/_components/layouts/common/LeftMenu.tsx
        new file:   app/_services/constants.ts
        new file:   app/_services/useCourseManagerService copy.ts
        new file:   app/_services/useCourseManagerService.ts
        new file:   app/_services/useUserInfoService.ts
        modified:   package-lock.json
        modified:   package.json
        modified:   tsconfig.json

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
        both modified:   app/_services/index.ts

The stash entry is kept in case you need it again.

 

계정 정보 설정

git config user.name "테스트"
git config user.email "test@gmail.com"

PS C:\software\project\test-ui> git config user.name "테.스.트"
PS C:\software\project\test-ui> git config user.email "test@gmail.com"

 

commit 실패 오류가 난다면 gitlab 권한 확인하기