2024_11_20 취준일기 1일차

어제 수업을 마쳤고 이제 집에서 학원처럼 공부를 해야한다 생각해서 일지를 시작함

선생님의 추천 스케줄은 이러했다

• 09:00~13:00 코딩 3~4시간
• 14:00~15:00 프로그래머스 공부 (Level 0,1 JAVA/SQL) 1시간 이상~
• 15:00~18:00 이력서/지원/면접 준비 활동

 

스터디는 월요일부터 계획을 짜기로 했기에 이번주는 집에서 공부 환경을 만드는 것을 목표로!

다만 오늘 아침에 추가 건강검진을 받는게 시간이 생각보다 오래걸려서 점심까지 먹고보니 1시가 넘어버려서 아쉽게도 아침 공부시간은 넘길 수밖에 없었다

 

 

오늘의 계획

1. 노트북에서만 Git을 사용했으니 집의 데스크탑에 설치하기 (완료)

---

2. 개인 레포지토리 만들어서 프로젝트 업뎃하기(완료)

일단 10월까지 했던 1차 플젝 코드부터 업뎃하기로!

 

git과 연결하는 도중 줄바꿈 관련 메시지가 마구 떴다

$ git add .
warning: in the working copy of '.gitignore', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of '.metadata/.log', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of '.mvn/wrapper/maven-wrapper.properties', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'HELP.md', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'mvnw.cmd', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'pom.xml', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/JmAutoApplication.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/ServletInitializer.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/controller/JhController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/controller/JmController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/controller/MhController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/controller/MsController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/controller/ShController.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/dao/jm/JmDao.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/dao/jm/JmDaoImpl.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/domain/Account5.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/domain/User_Table5.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/dto/Paging.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/service/jm/EmailService.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/service/jm/EmailServiceImpl.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/service/jm/JmService.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/java/com/oracle/jmAuto/service/jm/JmServiceImpl.java', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/mappers/jm_login.xml', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/static/css/jh_Stats_Chart.css', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/static/css/jquery-ui.css', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/static/css/jquery-ui.min.css', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/static/js/html2canvas.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/static/js/html2canvas.min.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/static/js/jquery-ui.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/resources/static/js/jquery.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/header.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/header_white.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/kakao.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/buyerJoinAgree.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/buyerJoinInfo.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/findPw.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/findPwResult.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/joinOk.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/joinType.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/login.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/manager_adminList.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/manager_userApproval.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/manager_userDetail.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/manager_userList.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/profJoinAgree.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/profJoinInfo_1.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/profJoinInfo_2.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/profJoinRequest.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/sellerJoinAgree.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/sellerJoinInfo_1.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/sellerJoinInfo_2.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jm/sellerJoinRequest.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_jw/csMain.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/main/webapp/WEB-INF/views/view_sh/sellMyCar.jsp', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'src/test/java/com/oracle/jmAuto/JmAutoApplicationTests.java', LF will be replaced by CRLF the next time Git touches it

 

해결방법은 아래와 같다

1. core.autocrlf 설정변경

git config --global core.autocrlf true

이 명령어는 Git이 Windows 환경에서 줄 바꿈을 자동으로 처리하도록 설정합니다.

• 체크아웃할 때: LF → CRLF로 변환
• 커밋할 때: CRLF → LF로 변환

2. .gitattributes 파일 생성

echo "* text=auto" > .gitattributes

 

그런데 다시 git add .을 하니 오류가 남

warning: in the working copy of '.gitattributes', LF will be replaced by CRLF the next time Git touches it

 

다시 해결하기

1. .gitattributes 파일 다시 추가하기

git add .gitattributes

 

2. 변경사항 커밋하기

git commit -m "Fix .gitattributes line endings"

 

이러고 다시 git add .을 하니 오류가 나지 았았다

하지만 이번엔 push origin develop 브랜치에 하려니 오류가 남

아무것도 없는 브랜치라도 pull부터 땡기고 push를 해야하나? 했는데

 

$ git pull origin develop
remote: Enumerating objects: 206, done.
remote: Counting objects: 100% (206/206), done.
remote: Compressing objects: 100% (141/141), done.
remote: Total 206 (delta 39), reused 179 (delta 24), pack-reused 0 (from 0)
Receiving objects: 100% (206/206), 3.13 MiB | 45.82 MiB/s, done.
Resolving deltas: 100% (39/39), done.
From https://github.com/rollout147/JmAuto_1st_Project
 * branch            develop    -> FETCH_HEAD
 * [new branch]      develop    -> origin/develop
fatal: refusing to merge unrelated histories

이렇게 뜬걸보니 아까 위에 올린 commit 때문에 이미 다 올라갔었나? 했는데

 

pull을 땡기고 add와 commit를 하려니 commit에 이미 커밋에 됐다는 말에 push를 하려니까 merge에 문제가 생김

이상한 창에 들어갔는데 nano창이란다

 GNU nano 8.2    C:/Spring/springSrc17/jmAuto/.git/COMMIT_EDITMSG    Modified
Merge branch 'develop' of https://github.com/rollout147/JmAuto_1st_Project into># Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#
# It looks like you may be committing a merge.
# If this is not correct, please run
#       git update-ref -d MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch develop
# All conflicts fixed but you are still merging.
# 202411201532 commit

                                 [ Cancelled ]
^G Help      ^O Write Out ^F Where Is  ^K Cut       ^T Execute   ^C Location
^X Exit      ^R Read File ^\ Replace   ^U Paste     ^J Justify   ^/ Go To Line

 

nano 창에서 #은 주석처리이므로 아래로 쭉 내려와서 커밋 메시지 하나 적고

Ctrl + O로 저장한뒤, 엔터 눌러서 저장, Ctrl + X해서 nano 종료

 

이렇게 하고 push하니까 잘됐다

git에 들어가 pull request 까지 완료! 휴 힘들어라

 

---

3. 취업센터에서 조언한거 바탕으로 자소서 고치기(완료)

주어를 자주 쓰는 버릇(저는, 제가 같은)을 고치기 위해 주어를 대부분 빼고 작성했다. 덕분에 조금 자신감 넘치는 자소서가 되었다

또한 이건 내 오랜 버릇인데 문장을 긴 호흡으로 작성하는 버릇이 있다. 자소서에서는 최대한 두괄식으로 작성해야 한다고 하길래, 입으로 소리내서 읽어가며 긴듯한 문장을 다 반으로 잘라버렸다.

 

---

 

4. 이력서 기본 틀 내용 전반적으로 수정하기(완료)

 

5. 기업마다 자소서 조금씩 수정해서 지원하기(완료)