Git/Trouble Shooting
![[Trouble Shooting] git pull - merge 실패 "fatal: Need to specify how to reconcile divergent branches."](https://img1.daumcdn.net/thumb/R750x0/?scode=mtistory2&fname=https%3A%2F%2Fblog.kakaocdn.net%2Fdna%2FqOXJE%2FbtrRzw81CLw%2FAAAAAAAAAAAAAAAAAAAAAIzCTvhuzDD9qHDN6tqwjoAom8CzvmpayAukFjUyhzp9%2Fimg.png%3Fcredential%3DyqXZFxpELC7KVnFOS48ylbz2pIh7yKj8%26expires%3D1751295599%26allow_ip%3D%26allow_referer%3D%26signature%3D8w4Vo4HXlASwANu0yfhs9OARYIg%253D)
[Trouble Shooting] git pull - merge 실패 "fatal: Need to specify how to reconcile divergent branches."
발생 작업 공용 브랜치 dev-be로부터 작업할 브랜치를 생성 후 작업함. 작업 후 커밋하기전 dev-be의 작업 전 버전과 작업 후 버전이 차이가 있는 상황. 로컬에서 최신 dev-be를 pull한 다음 충돌나는 부분을 해결 후 커밋하려고 했는데, pull하는 과정에서 아래와 같은 이슈가 발생함. 원인 You have divergent branches and need to specify how to reconcile them. fatal: Need to specify how to reconcile divergent branches. 현재 Local의 dev-be 버전과 Remote의 dev-be의 버전(분기)가 달라 pull할 때 merge가 되어야 하는데 pull 전략이 따로 지정되어 있지 않아 위와..
![[Trouble Shooting] error: Your local changes to the following files would be overwritten by merge:](https://img1.daumcdn.net/thumb/R750x0/?scode=mtistory2&fname=https%3A%2F%2Fblog.kakaocdn.net%2Fdna%2FXR50r%2FbtrRAfsartF%2FAAAAAAAAAAAAAAAAAAAAAICfsAADCkP_kEB5c_L4O-xfUySFGegwYf_gj_Puy1pz%2Fimg.png%3Fcredential%3DyqXZFxpELC7KVnFOS48ylbz2pIh7yKj8%26expires%3D1751295599%26allow_ip%3D%26allow_referer%3D%26signature%3DojzU3PgzxR3HVBRmsBZAkYPRqQM%253D)
[Trouble Shooting] error: Your local changes to the following files would be overwritten by merge:
발생 A 브랜치에서 커밋한 뒤 B 브랜치로 변경하려고 하는데 다음과 같은 erorr가 발생함. wk@MacBookm1-Pro seb40_main_025 % git switch -t origin/Feat/#37 error: Your local changes to the following files would be overwritten by checkout: server/oneyearfourcut/src/test/java/com/codestates/mainproject/oneyearfourcut/artwork/repository/ArtworkRepositoryTest.java Please commit your changes or stash them before you switch branches. Abort..