📌 branch 이론 이해하기
https://git-scm.com/book/ko/v2/Git-%EB%B8%8C%EB%9E%9C%EC%B9%98-%EB%B8%8C%EB%9E%9C%EC%B9%98%EB%9E%80-%EB%AC%B4%EC%97%87%EC%9D%B8%EA%B0%80

• 실습을 위한 프라이빗 Repository 생성
  

🧷 README
프로젝트에 대한 설명, 사용방법, 라이센스, 설치방법 등에 대한 내용을 기술하는 파일
🧷 gitignore
Git 버전관리에서 제외할 파일목록을 지정하는 파일
사용자가 원하지 않는 파일들을 자동으로 commit 대상에서 제외시켜줌

Default Branch

---

Repository 생성 시 defalt로 생성된다.

• github은 main이 디폴트
• git은 master이 디폴트

• 수정
  
  단, 다른팀원들까지 영향을 받을 수 있으므로
  신중하게 변경할 것.

• 디폴트값 변경
  
  세팅 -> Repository -> 디폴트값 변경

Git Clone | Remote Repository 복제

---

🚩 Local Repository 를 생성하지 않은 상태에서
Git Clone 명령을 사용하여 Remote Repository 를 Local 에 복제해보자

🧷 Git Clone
앞서 폴더를 만들고

• Git Init 으로 해당 폴더를 초기화 하고 (git이 관리)
• Remote Repository 를 등록하고
• Remote Repository 의 내용을 Pull 하는 모든 과정을 Git Clone 으로 할수 있음
  

박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws (master)
$ git clone https://sxlbl:{토큰값}@github.com/sxlbl/HelloGit.git
Cloning into 'HelloGit'...
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 4 (delta 0), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (4/4), done.

박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws (master)
$ ls
HelloGit/  test_project/

=> local에 hello git 생성확인

Branch

---

🚩 어떤 프로젝트를 진행하다가 두가지 알고리즘을 동시에 두팀으로 나눠 진행하고 싶을 때,
Branch 내서 병행해서 작업할 수 있고 버전도 따로 낼 수 있다.
또는 릴리즈 Branch와 개발 Branch를 따로 사용 할 수 있다.

💡 Local → Remote : git add commit push
💡 Remote → Local : git pull

조회

🧷 Branch 조회 (Local Branch)

git branch

🧷 Branch 조회 (Remote Branch)

git branch -r

🧷 Branch 조회 (전체)

git branch -a

📢 Branch를 Local Repository에서 생성했다고 바로 Remote Repository에 공유되지 않는다.
Remote로 push해줘함

📌 Branch 조회 (Local Branch) 
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git branch
* master

📌 Branch 조회 (Remote Branch) 
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git branch -r
  origin/HEAD -> origin/master
  origin/master

📌 Branch 조회 (전체)  
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git branch -a
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master

(Local Branch) 생성, 이동, 생성&이동

🧷 Branch 생성

git branch <branchname>

🧷 Branch 이동

git checkout <branchname>

🧷 Branch 생성 & 이동 -> 기존 브랜치가 없어야함

git checkout -b <branchname>

📌 Branch 생성   
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git branch branch01

📌 Branch 생성확인   
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git branch
  branch01
* master

📌 Branch 이동   
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git checkout branch01
Switched to branch 'branch01'

📌 Branch 이동확인   
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (branch01) 📌 ()가 master에서 branch01로 변경됨
$ git branch
* branch01
  master

📌 Branch 생성&이동   
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (branch01)
$ git checkout -b branch02
Switched to a new branch 'branch02'

📌 Branch 이동확인   
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (branch02)
$ git branch
  branch01
* branch02
  master

(Local → Remote) Branch 생성 적용

🧷 Local 에서 생성한 Branch Remote에 적용

git push origin <branchname>

📌 branch01 적용   
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (branch02)
$ git push origin branch01
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote:
remote: Create a pull request for 'branch01' on GitHub by visiting:
remote:      https://github.com/sxlbl/HelloGit/pull/new/branch01
remote:
To https://github.com/sxlbl/HelloGit.git
 * [new branch]      branch01 -> branch01
 
📌 branch02 적용   
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (branch02)
$ git push origin branch02
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote:
remote: Create a pull request for 'branch02' on GitHub by visiting:
remote:      https://github.com/sxlbl/HelloGit/pull/new/branch02
remote:
To https://github.com/sxlbl/HelloGit.git
 * [new branch]      branch02 -> branch02

📌 branch 적용확인   
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (branch02)
$ git branch -a
  branch01
* branch02
  master
  remotes/origin/HEAD -> origin/master
  remotes/origin/branch01
  remotes/origin/branch02
  remotes/origin/master

(Local Branch) 삭제

🧷 Branch 삭제

git branch -d <branchname>

📢 단, 활성화 된 상태에서는 삭제가 되지 않으므로
마스터 브랜치로 이동 후 삭제한다.

📌 branch02가 활성화 된 상태에서 삭제 시 에러
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (branch02)
$ git branch -d branch02
error: cannot delete branch 'branch02' used by worktree at 'C:/Users/solbi/OneDrive/Documents/git_ws/HelloGit'

📌 master로 이동
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (branch02)
$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.

📌 branch02삭제
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git branch -d branch02
Deleted branch branch02 (was 40b9102).

📌 branch 조회 (삭제확인)
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git branch
  branch01
* master

📌 branch01 삭제
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git branch -d branch01
Deleted branch branch01 (was 40b9102).

📌 local의 branch는 모두 삭제 되었으나, remote에는 아직 반영되지 않았으므로 적용을 해주어야함

박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git branch -a
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/branch01
  remotes/origin/branch02
  remotes/origin/master

(Local → Remote) Branch 삭제 적용

🧷 Branch (Local → Remote) 삭제적용

git push origin --delete <branchname>

📌 branch02 삭제
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git push origin --delete branch02
To https://github.com/sxlbl/HelloGit.git
 - [deleted]         branch02

📌 branch01 삭제
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git push origin --delete branch01
To https://github.com/sxlbl/HelloGit.git
 - [deleted]         branch01

📌 삭제확인
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ git branch -a
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master

-> 삭제확인

실습

---

1. Remote Repository 생성하기

2. Local 에 Clone

박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/HelloGit (master)
$ cd ..


박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws (master)
🚩 $ git clone https://sxlbl:{토큰값}@github.com/sxlbl/branch_project.git
Cloning into 'branch_project'...
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 4 (delta 0), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (4/4), done.

3. Branch 생성 후 이동

박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws (branch01)
$ cd branch_project/

🚩 branch02 생성
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (main)
$ git branch branch02

🚩 branch01 생성 이동
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (main)
$ git checkout -b branch01
Switched to a new branch 'branch01'

🚩 branch 목록 확인
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (branch01)
$ git branch -a
* branch01
  branch02
  main
  remotes/origin/HEAD -> origin/main
  remotes/origin/main

4. Branch Push

🚩 branch02 remote 적용
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (branch01)
$ git push origin branch02
goTotal 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote:
remote: Create a pull request for 'branch02' on GitHub by visiting:
remote:      https://github.com/sxlbl/branch_project/pull/new/branch02
remote:
To https://github.com/sxlbl/branch_project.git
 * [new branch]      branch02 -> branch02

🚩 branch01 remote 적용
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (branch01)
$ git push origin branch01
giTotal 0 (delta 0), reused 0 (delta 0), pack-reused 0
tremote:
remote: Create a pull request for 'branch01' on GitHub by visiting:
remote:      https://github.com/sxlbl/branch_project/pull/new/branch01
remote:
To https://github.com/sxlbl/branch_project.git
 * [new branch]      branch01 -> branch01

🚩 branch 목록확인
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (branch01)
$ git branch -a
* branch01
  branch02
  main
  remotes/origin/HEAD -> origin/main
  remotes/origin/branch01
  remotes/origin/branch02
  remotes/origin/main

5. Local Branch 삭제

🚩 branch02 삭제
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (branch01)
$ git branch -d branch02
Deleted branch branch02 (was 4a6c05d).

🚩 활성화된 상태에서는 삭제 에러
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (branch01)
$ git branch -d branch01
error: cannot delete branch 'branch01' used by worktree at 'C:/Users/solbi/OneDrive/Documents/git_ws/branch_project'

🚩 main으로 이동
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (branch01)
$ git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.

🚩 branch01 삭제
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (main)
$ git branch -d branch01
Deleted branch branch01 (was 4a6c05d).

🚩 branch 목록 확인
박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (main)
$ git branch -a
* main
  remotes/origin/HEAD -> origin/main
  remotes/origin/branch01
  remotes/origin/branch02
  remotes/origin/main

6. Remote Branch 모두 삭제

박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (ma
$ git push origin --delete branch02
To https://github.com/sxlbl/branch_project.git
 - [deleted]         branch02

박솔비@솔비의gram MINGW64 ~/OneDrive/Documents/git_ws/branch_project (ma
$ git push origin --delete branch01
To https://github.com/sxlbl/branch_project.git
 - [deleted]         branch01

---

Daily Study Note