diff --git a/README.md b/README.md index a60ae80..3ac12ea 100644 --- a/README.md +++ b/README.md @@ -1,77 +1,54 @@ -# Git Study -- [0️⃣ Git 사전 설정](#0️⃣-git-사전-설정) -- [1️⃣️ Git 기초](#1️⃣️-git-기초) -- [2️⃣️ Git 협업](#2️⃣️-git-협업) -- [3️⃣️ 협업 중 문제상황](#3️⃣️-협업-중-문제상황) -- [4️⃣️ 동아리 협업](#4️⃣️-동아리-협업) -- [🔗️ 참고](#️-참고) - - -![learn-git](https://i0.wp.com/blog.nextstacks.com/wp-content/uploads/2021/11/Reasons-to-Learn-Git-as-a-Developer-New.png?fit=1280%2C720&ssl=1) - 동아리 Git 스터디/워크샵을 위한 리포지토리입니다. 스터디는 실습 형식으로 총 4단계로 구성되어 있으며 2~3일에 걸쳐 진행합니다. git 커맨드라인 환경에서 진행하므로 사전에 [동아리 개발환경 설정](https://github.com/ApptiveDev/.github/blob/main/docs/Dev%20Environment%20Setup.md) 문서를 따라주시기 바랍니다. 또, 스터디를 진행하면서 부족한 부분은 계속 보완해주시기 바랍니다. -- 개인의 선호에 따라 GUI 툴 활용 가능 (GitKraken, SourceTree, Github GUI 등) -- 디스코드 등 화면 공유가 잘 되는지 사전에 확인할 것 (ref. [Ubuntu Black Screen Sharing](https://askubuntu.com/questions/1407494/screen-share-not-working-in-ubuntu-22-04-in-all-platforms-zoom-teams-google-m)) - -## 0️⃣ Git 사전 설정 --> [step-0 브랜치](https://github.com/ApptiveDev/workshop-git/tree/step-0) -### 🎯️ 목표 -워크샵 이전에 환경 설정을 진행하고 git이 제대로 동작하는지 확인합니다. -### 📜️ 진행 -- `step-0`에서 지정하는 개발도구를 사전에 설치합니다. -- 현재 레포를 로컬에 clone하고 `step-0` 브랜치로 이동합니다. -- `/playground`에 간단한 파일을 남기고 commit, push 합니다. -- 오류가 있다면 워크샵 이전에 해결합니다. - -## 1️⃣️ Git 기초 --> [step-1 브랜치](https://github.com/ApptiveDev/workshop-git/tree/step-1) -### 🎯️ 목표 -git과 github의 차이점, git이 동작하는 과정, git 기본 명령어를 알아봅시다! -### 📜️ 진행 -- `step-1` 브랜치로부터 자신의 브랜치를 생성합니다. -- `README`에 주어진 키워드를 조사하고 본인의 README를 작성합니다. -- 작성 후 `step-1` 브랜치로 Pull Request를 올립니다. - -## 2️⃣️ Git 협업 --> [step-2 브랜치](https://github.com/ApptiveDev/workshop-git/tree/step-2) -### 🎯️ 목표 -앞서 익힌 git 명령어를 활용해 간단한 협업을 진행해봅니다. - -### 📜️ 진행 -- `step-2` 브랜치로 이동합니다. -- `README` 및 Issue에 따라 할일을 분담하여 개인 브랜치를 만듭니다. -- 할일을 마치고 `step-2` 브랜치로 Pull Request를 올립니다. - -## 3️⃣️ 협업 중 문제상황 --> [step-3 브랜치](https://github.com/ApptiveDev/workshop-git/tree/step-3) -### 🎯️ 목표 -협업 중 맞닥뜨릴 수 있는 다양한 문제상황을 git 명령어로 해결해봅니다. -### 📜️ 진행 -- `step-3` 브랜치에 제시된 문제 상황들을 확인합니다. -- 스터디장은 상황별 한 명의 스터디원을 지목하고, 명령어를 차례대로 알려줍니다. -- 스터디원은 명령어를 듣고 문제상황을 해결해봅니다. - -## 4️⃣️ 동아리 협업 --> [step-4 브랜치](https://github.com/ApptiveDev/study-git/tree/step-4) -### 🎯️ 목표 -백엔드와 프론트 사이에 서버 배포 없이 협업 중 로컬에서 테스트하는 방법을 배워봅시다. - -### 📜️ 진행 -(작성 예정) - -## 🔗️ 참고 -### Github Student Developer Pack -대학생은 [Github Student Developer Pack](https://education.github.com/pack/offers)을 무료로 누릴 수 있으니 링크에서 신청하시기 바랍니다. Github Pro 뱃지와 각종 클라우드 서비스(Azure, MongoDB, Heroku 등)에서 크레딧 등 학생용 혜택이 주어집니다. - -### Chrome Remote Desktop - 비대면 스터디 중 원격 접속을 위해 [Chrome Remote Desktop](https://remotedesktop.google.com/support)을 이용합니다. - [크롬 브라우저](https://www.google.co.kr/intl/ko/chrome/) 및 [확장 프로그램](https://chrome.google.com/webstore/detail/chrome-remote-desktop/inomeogfingihgjfjlpeplalcfajhgai)을 미리 설치하시기 바랍니다. -### 같이 보기 -- [누구나 쉽게 이해할 수 있는 Git 입문](https://backlog.com/git-tutorial/kr/) -- [Visualizing Git - 시각적인 git 연습](https://git-school.github.io/visualizing-git/) -- [Learn Git Branching - 시각적인 git 튜토리얼](https://learngitbranching.js.org/?locale=ko) - -## Contributors -| | | -|:----------------------------------------------:|:----------------------------------------------:| -| | | -| [15기 장원석](https://github.com/Cotidie) | [20기 강민석](https://github.com/myeolinmalchi) | \ No newline at end of file +# 0️⃣ Git 설정 +원활한 Git 워크샵 진행을 위해 환경 설정을 사전 점검합니다. + +## 도구 설치 +워크샵은 Visual Studio Code와 Git CLI를 기준으로 진행합니다. 단, 편의에 따라 Git CLI 대신 Github Desktop, SourceTree 등 GUI 툴을 활용해도 됩니다. 사전 점검 이전에 다음의 개발 도구가 모두 설치되어 있는지 확인바랍니다. + +### Git +| 🔗 https://git-scm.com/downloads +1. git-scm (공식) 페이지에서 git 최신 버전을 다운로드 받습니다. +2. `Git Bash` 또는 터미널 창에 `git --version`을 입력해 정상 설치 여부를 확인합니다. +```bash +# 정상 설치 여부 확인 +$ git --version +git version 2.34.1 +``` + +### VS Code Plugins +![VS Code](./images/01-vs-code-window.png) + +| 🔗 https://code.visualstudio.com/ +1. (VS Code가 없다면) visual studio 홈페이지에서 최신 버전을 설치합니다. +2. VS Code를 실행하고, 좌측 `Extensions` 탭에서 다음 두 가지 플러그인을 설치합니다. + - **Git Graph**: Commit 기록을 한 눈에 확인하고, reset/rebase 등 다양한 기능 지원 + - **Git Lens**: 코드 편집 중 Commit 작성자를 쉽게 확인할 수 있음 +3. 좌측 하단에 `Git Graph` 버튼으로 Commit 기록을 확인합니다. + - Git Graph 버튼이 생기지 않았다면 VS Code 재실행 + +## 사전 점검 +### ❗️ Write Access 요청 +1. APPTIVE 운영진에게 자신의 Github 닉네임과 이메일 주소를 전달합니다. +2. 워크샵 레포(현재 레포)에 대한 쓰기 권한을 부여받습니다. + - 브랜치를 직접 생성하며 진행할 것이기에 사전에 반드시 권한을 요청하시기 바랍니다. + +### Push 테스트 +![Git Clone](./images/02-git-clone.png) + +1. 현재 레포를 로컬에 Clone 합니다. +```bash +$ git clone +$ cd workshop-git +``` +2. `step-0` 브랜치로 이동합니다. +```bash +$ git checkout step-0 +``` +3. `/playground`에 자신의 이름을 딴 텍스트 파일을 하나 만들고 내용을 채운 후 push 합니다. +```bash +$ echo "aaaa"> ./playground/본인_이름.txt +$ git add . +$ git commit -m "step-0 사전설정 테스트" +$ git push +``` + +만약 git push에 오류가 생긴다면 운영진에게 문의주시고, 워크샵 이전에 해결할 수 있도록 합니다. diff --git a/images/01-vs-code-window.png b/images/01-vs-code-window.png new file mode 100644 index 0000000..3b1f531 Binary files /dev/null and b/images/01-vs-code-window.png differ diff --git a/images/02-git-clone.png b/images/02-git-clone.png new file mode 100644 index 0000000..1d804ea Binary files /dev/null and b/images/02-git-clone.png differ diff --git a/playground/Kim_Jae_Hyeong.txt b/playground/Kim_Jae_Hyeong.txt new file mode 100644 index 0000000..ab7e371 --- /dev/null +++ b/playground/Kim_Jae_Hyeong.txt @@ -0,0 +1 @@ +"aaaa" diff --git a/playground/Leehyunho.txt b/playground/Leehyunho.txt new file mode 100644 index 0000000..3dfadd5 Binary files /dev/null and b/playground/Leehyunho.txt differ diff --git a/playground/dummy b/playground/dummy new file mode 100644 index 0000000..2995a4d --- /dev/null +++ b/playground/dummy @@ -0,0 +1 @@ +dummy \ No newline at end of file diff --git a/playground/jiyoun.txt b/playground/jiyoun.txt new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ b/playground/jiyoun.txt @@ -0,0 +1 @@ +aaaa diff --git a/playground/lee_choenseo.txt b/playground/lee_choenseo.txt new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ b/playground/lee_choenseo.txt @@ -0,0 +1 @@ +aaaa diff --git a/playground/minseoriii.txt b/playground/minseoriii.txt new file mode 100644 index 0000000..ab7e371 --- /dev/null +++ b/playground/minseoriii.txt @@ -0,0 +1 @@ +"aaaa" diff --git a/playground/soyoung.txt b/playground/soyoung.txt new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ b/playground/soyoung.txt @@ -0,0 +1 @@ +aaaa diff --git a/playground/yujin.txt b/playground/yujin.txt new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ b/playground/yujin.txt @@ -0,0 +1 @@ +aaaa diff --git "a/playground/352円260円225円353円260円261円355円230円270円.txt" "b/playground/352円260円225円353円260円261円355円230円270円.txt" new file mode 100644 index 0000000..3dfadd5 Binary files /dev/null and "b/playground/352円260円225円353円260円261円355円230円270円.txt" differ diff --git "a/playground/352円260円225円354円247円200円354円233円220円.txt" "b/playground/352円260円225円354円247円200円354円233円220円.txt" new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ "b/playground/352円260円225円354円247円200円354円233円220円.txt" @@ -0,0 +1 @@ +aaaa diff --git "a/playground/352円263円275円354円234円244円354円240円225円.txt" "b/playground/352円263円275円354円234円244円354円240円225円.txt" new file mode 100644 index 0000000..ab7e371 --- /dev/null +++ "b/playground/352円263円275円354円234円244円354円240円225円.txt" @@ -0,0 +1 @@ +"aaaa" diff --git "a/playground/352円271円200円352円260円200円354円227円260円.txt" "b/playground/352円271円200円352円260円200円354円227円260円.txt" new file mode 100644 index 0000000..3dfadd5 Binary files /dev/null and "b/playground/352円271円200円352円260円200円354円227円260円.txt" differ diff --git "a/playground/352円271円200円352円270円260円354円234円244円.txt" "b/playground/352円271円200円352円270円260円354円234円244円.txt" new file mode 100644 index 0000000..3c56a68 --- /dev/null +++ "b/playground/352円271円200円352円270円260円354円234円244円.txt" @@ -0,0 +1 @@ +test-GiyunKim diff --git "a/playground/352円271円200円353円245円234円354円230円201円.txt" "b/playground/352円271円200円353円245円234円354円230円201円.txt" new file mode 100644 index 0000000..9daeafb --- /dev/null +++ "b/playground/352円271円200円353円245円234円354円230円201円.txt" @@ -0,0 +1 @@ +test diff --git "a/playground/352円271円200円353円252円205円354円204円261円.txt" "b/playground/352円271円200円353円252円205円354円204円261円.txt" new file mode 100644 index 0000000..2cb5dbc --- /dev/null +++ "b/playground/352円271円200円353円252円205円354円204円261円.txt" @@ -0,0 +1 @@ +aaaa diff --git "a/playground/352円271円200円354円236円254円354円213円235円.txt" "b/playground/352円271円200円354円236円254円354円213円235円.txt" new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ "b/playground/352円271円200円354円236円254円354円213円235円.txt" @@ -0,0 +1 @@ +aaaa diff --git "a/playground/352円271円200円354円247円200円353円257円274円.txt" "b/playground/352円271円200円354円247円200円353円257円274円.txt" new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ "b/playground/352円271円200円354円247円200円353円257円274円.txt" @@ -0,0 +1 @@ +aaaa diff --git "a/playground/352円271円200円355円203円234円353円236円200円.txt" "b/playground/352円271円200円355円203円234円353円236円200円.txt" new file mode 100644 index 0000000..5d639d7 --- /dev/null +++ "b/playground/352円271円200円355円203円234円353円236円200円.txt" @@ -0,0 +1 @@ +taeran diff --git "a/playground/352円271円200円355円203円234円354円232円260円.txt" "b/playground/352円271円200円355円203円234円354円232円260円.txt" new file mode 100644 index 0000000..7284ab4 --- /dev/null +++ "b/playground/352円271円200円355円203円234円354円232円260円.txt" @@ -0,0 +1 @@ +aaaa \ No newline at end of file diff --git "a/playground/353円202円230円354円230円210円354円235円200円.txt" "b/playground/353円202円230円354円230円210円354円235円200円.txt" new file mode 100644 index 0000000..3dfadd5 Binary files /dev/null and "b/playground/353円202円230円354円230円210円354円235円200円.txt" differ diff --git "a/playground/353円260円225円354円206円214円354円230円201円.txt" "b/playground/353円260円225円354円206円214円354円230円201円.txt" new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ "b/playground/353円260円225円354円206円214円354円230円201円.txt" @@ -0,0 +1 @@ +aaaa diff --git "a/playground/353円260円225円354円236円254円355円231円215円.txt" "b/playground/353円260円225円354円236円254円355円231円215円.txt" new file mode 100644 index 0000000..aea7ed2 --- /dev/null +++ "b/playground/353円260円225円354円236円254円355円231円215円.txt" @@ -0,0 +1 @@ +잘 부탁드립니다. \ No newline at end of file diff --git "a/playground/354円206円220円354円240円225円355円233円210円.txt" "b/playground/354円206円220円354円240円225円355円233円210円.txt" new file mode 100644 index 0000000..3dfadd5 Binary files /dev/null and "b/playground/354円206円220円354円240円225円355円233円210円.txt" differ diff --git "a/playground/354円213円240円354円204円270円355円231円230円.txt" "b/playground/354円213円240円354円204円270円355円231円230円.txt" new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ "b/playground/354円213円240円354円204円270円355円231円230円.txt" @@ -0,0 +1 @@ +aaaa diff --git "a/playground/354円225円210円354円247円200円354円233円220円.txt" "b/playground/354円225円210円354円247円200円354円233円220円.txt" new file mode 100644 index 0000000..3dfadd5 Binary files /dev/null and "b/playground/354円225円210円354円247円200円354円233円220円.txt" differ diff --git "a/playground/354円227円254円354円261円204円354円226円270円.txt" "b/playground/354円227円254円354円261円204円354円226円270円.txt" new file mode 100644 index 0000000..810118c Binary files /dev/null and "b/playground/354円227円254円354円261円204円354円226円270円.txt" differ diff --git "a/playground/354円234円240円355円230円270円354円230円201円.txt" "b/playground/354円234円240円355円230円270円354円230円201円.txt" new file mode 100644 index 0000000..3dfadd5 Binary files /dev/null and "b/playground/354円234円240円355円230円270円354円230円201円.txt" differ diff --git "a/playground/354円234円244円354円204円234円352円262円275円.txt" "b/playground/354円234円244円354円204円234円352円262円275円.txt" new file mode 100644 index 0000000..7284ab4 --- /dev/null +++ "b/playground/354円234円244円354円204円234円352円262円275円.txt" @@ -0,0 +1 @@ +aaaa \ No newline at end of file diff --git "a/playground/354円235円264円353円263円221円354円260円254円.txt" "b/playground/354円235円264円353円263円221円354円260円254円.txt" new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ "b/playground/354円235円264円353円263円221円354円260円254円.txt" @@ -0,0 +1 @@ +aaaa diff --git "a/playground/354円235円264円354円210円230円353円271円210円.txt" "b/playground/354円235円264円354円210円230円353円271円210円.txt" new file mode 100644 index 0000000..45b983b --- /dev/null +++ "b/playground/354円235円264円354円210円230円353円271円210円.txt" @@ -0,0 +1 @@ +hi diff --git "a/playground/354円235円264円354円230円210円353円236円214円.txt" "b/playground/354円235円264円354円230円210円353円236円214円.txt" new file mode 100644 index 0000000..12e1107 --- /dev/null +++ "b/playground/354円235円264円354円230円210円353円236円214円.txt" @@ -0,0 +1 @@ +"aaa" diff --git "a/playground/354円235円264円354円230円210円354円235円200円.txt" "b/playground/354円235円264円354円230円210円354円235円200円.txt" new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ "b/playground/354円235円264円354円230円210円354円235円200円.txt" @@ -0,0 +1 @@ +aaaa diff --git "a/playground/354円236円204円353円202円230円353円271円210円.txt" "b/playground/354円236円204円353円202円230円353円271円210円.txt" new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ "b/playground/354円236円204円353円202円230円353円271円210円.txt" @@ -0,0 +1 @@ +aaaa diff --git "a/playground/354円240円225円353円213円244円355円230円204円.txt" "b/playground/354円240円225円353円213円244円355円230円204円.txt" new file mode 100644 index 0000000..5d308e1 --- /dev/null +++ "b/playground/354円240円225円353円213円244円355円230円204円.txt" @@ -0,0 +1 @@ +aaaa diff --git "a/playground/354円240円225円354円234円240円354円247円204円.txt" "b/playground/354円240円225円354円234円240円354円247円204円.txt" new file mode 100644 index 0000000..4984d7c --- /dev/null +++ "b/playground/354円240円225円354円234円240円354円247円204円.txt" @@ -0,0 +1 @@ +우왕 diff --git "a/playground/354円247円200円354円232円260円352円260円200円353円236円214円.txt" "b/playground/354円247円200円354円232円260円352円260円200円353円236円214円.txt" new file mode 100644 index 0000000..4f68d56 --- /dev/null +++ "b/playground/354円247円200円354円232円260円352円260円200円353円236円214円.txt" @@ -0,0 +1 @@ +"Hello, World!" \ No newline at end of file diff --git "a/playground/354円261円204円354円212円271円354円225円204円.txt" "b/playground/354円261円204円354円212円271円354円225円204円.txt" new file mode 100644 index 0000000..3dfadd5 Binary files /dev/null and "b/playground/354円261円204円354円212円271円354円225円204円.txt" differ diff --git "a/playground/354円265円234円352円264円221円354円247円204円.txt" "b/playground/354円265円234円352円264円221円354円247円204円.txt" new file mode 100644 index 0000000..ab7e371 --- /dev/null +++ "b/playground/354円265円234円352円264円221円354円247円204円.txt" @@ -0,0 +1 @@ +"aaaa" diff --git "a/playground/354円265円234円354円234円240円353円240円254円.txt" "b/playground/354円265円234円354円234円240円353円240円254円.txt" new file mode 100644 index 0000000..98a614e --- /dev/null +++ "b/playground/354円265円234円354円234円240円353円240円254円.txt" @@ -0,0 +1 @@ +"Hello, World!: \ No newline at end of file diff --git "a/playground/354円265円234円355円230円204円354円247円204円.txt" "b/playground/354円265円234円355円230円204円354円247円204円.txt" new file mode 100644 index 0000000..ab7e371 --- /dev/null +++ "b/playground/354円265円234円355円230円204円354円247円204円.txt" @@ -0,0 +1 @@ +"aaaa" diff --git "a/playground/355円230円204円354円212円271円353円257円274円.txt" "b/playground/355円230円204円354円212円271円353円257円274円.txt" new file mode 100644 index 0000000..3dfadd5 Binary files /dev/null and "b/playground/355円230円204円354円212円271円353円257円274円.txt" differ

AltStyle によって変換されたページ (->オリジナル) /