1. Your local changes to the following files would be overwritten by merge:

2. error: you need to resolve your current index first

3. error: Pulling is not possible because you have unmerged files.

4. error: pathspec 'alpha' did not match any file(s) known to git

1. Your local changes to the following files would be overwritten by merge:

1-1) git error message

remote: Enumerating objects: 117, done.
remote: Counting objects: 100% (117/117), done.
remote: Compressing objects: 100% (75/75), done.
remote: Total 91 (delta 49), reused 18 (delta 4), pack-reused 0
Unpacking objects: 100% (91/91), 22.86 KiB | 450.00 KiB/s, done.
From <http://gitlab.sdij.kr/be-2/myq-admin-api>
 * branch            dev        -> FETCH_HEAD
   19071e4..59a8af4  dev        -> origin/dev
Updating f861cd6..59a8af4
error: Your local changes to the following files would be overwritten by merge:
	src/main/java/com/hiconsysvc/myqadmin/domains/ta/application/TaListService.java
	src/main/java/com/hiconsysvc/myqadmin/domains/ta/dto/TaList.java
	src/main/java/com/hiconsysvc/myqadmin/domains/ta/repository/TaMasterRepository.java
Please commit your changes or stash them before you merge.
Aborting

1-2) 해결

• git stash

  • 현재 디렉토리의 파일을 임시로 백업하고 깨끗한 상태로 돌린다.
  • 버전관리 되는 대상 파일들을 임시저장 해둔다고 보면 된다.

  # Console
  Saved working directory and index state WIP on dev: f861cd6 질문상세 DTO 성능 최적화
  

• git pull origin ~

  # Console
  remote: Enumerating objects: 36, done.
  remote: Counting objects: 100% (36/36), done.
  remote: Compressing objects: 100% (16/16), done.
  remote: Total 19 (delta 11), reused 0 (delta 0), pack-reused 0
  Unpacking objects: 100% (19/19), 3.38 KiB | 216.00 KiB/s, done.
  

• git stash pop

  # Console
  Auto-merging src/main/java/com/hiconsysvc/myqadmin/domains/ta/repository/TaMasterRepository.java
  Auto-merging src/main/java/com/hiconsysvc/myqadmin/domains/ta/dto/TaList.java
  CONFLICT (content): Merge conflict in src/main/java/com/hiconsysvc/myqadmin/domains/ta/dto/TaList.java
  Auto-merging src/main/java/com/hiconsysvc/myqadmin/domains/ta/application/TaListService.java
  The stash entry is kept in case you need it again.
  

1-3) 충돌나는 Class Image

2. error: you need to resolve your current index first

2-1)

#message
error: you need to resolve your current index first

2-2) git reset --merge

2-3) git checkout dev-1998

2-4) git pull origin dev

3. error: Pulling is not possible because you have unmerged files.

3-1) 원인

• git stash를 통해 충돌 난 부분을 고친 후 git pull을 받으려고 했기 때문에 오류가 났다.

3-2) 해결

3-2)-1. git status를 통해 어떤 상태인지 확인하기

• Unmerged paths : 충돌난 상태
  • both modified : 수정한 상태임.
• Changes not staged for commit : modified 상태이지만 staged 못 올린 상태

3-2)-2. git add

• Changes not staged는 ‘Working Directory’에 있는 상황이다.

  파일 상태는 현재 ‘modified’ 상태다. 수정이 된 상태이기에 add를 통해 ‘Staged’ 상태로

  바꿀 수 있다. 그 상태는 Working Directory에서 Staging Area 장소를 옮길 수 있다는 거임.

• Staging Area로 옮기면 git pull을 할 수 있다. 원격 저장소에 업데이트 된 버전의 파일을

  내려 받을 수 있다.

3-2)-3. git pull ~

4. error: pathspec 'alpha' did not match any file(s) known to git

4-1)

• 에러가 난 이유는 ‘alpha’가 fetch가 되어있지 않기 때문이다.

**error: pathspec 'alpha' did not match any file(s) known to git**

4-2)

**명령어 git branch -a**

fetch -all