250x250
Rainbow๐ŸŒˆCoder
My dev Note๐Ÿ“’
Rainbow๐ŸŒˆCoder
์ „์ฒด ๋ฐฉ๋ฌธ์ž
์˜ค๋Š˜
์–ด์ œ
  • ๋ถ„๋ฅ˜ ์ „์ฒด๋ณด๊ธฐ (411)
    • ๊ณต์ง€์‚ฌํ•ญ (0)
    • Debugger (10)
      • Visual Studio Debugger (1)
      • Chrome DevTools (3)
      • Visual Studio Code Debugger (4)
      • eclipse (1)
      • intelliJ (1)
    • OOP (2)
      • OOP (2)
    • TypeScript (54)
      • ํƒ€์ž…์Šคํฌ๋ฆฝํŠธ TypeScript (54)
    • Javascript (87)
      • Javascript (45)
      • Node.js (19)
      • React (5)
      • FE ๊ฐœ๋ฐœํ™˜๊ฒฝ์„ค์ • (3)
      • React์™€ Node ๊ฐ™์ด ๋•Œ๋ ค์žก๊ธฐ (6)
      • next.js (2)
      • pixi.js (7)
    • ๋งˆํฌ์—… (23)
      • Html & Css (23)
    • C# (80)
      • C# (12)
      • ์ด๊ฒƒ์ด C#์ด๋‹ค (68)
    • C++ (30)
      • c++ (27)
      • win api (3)
    • Unity (18)
      • Unity(๊ธฐ์ดˆ) (8)
      • Unity(C#์ค‘๊ธ‰) (5)
      • ์œ ๋‹ˆํ‹ฐ ํฌํ†ค(๋„คํŠธ์›Œํฌ) (4)
      • unity c# MyCode (1)
    • Java & Spring (29)
      • Java (11)
      • ์Šคํ”„๋ง (8)
      • Java Algorithm (9)
      • Javs Data Structures (1)
    • ์ž๋ฃŒ๊ตฌ์กฐ์™€ ์•Œ๊ณ ๋ฆฌ์ฆ˜ (15)
      • ์ž๋ฃŒ๊ตฌ์กฐ (5)
      • ์•Œ๊ณ ๋ฆฌ์ฆ˜ (10)
    • ํ˜•์ƒ๊ด€๋ฆฌ (15)
      • Git (11)
      • ์†Œ์ŠคํŠธ๋ฆฌ (3)
    • ๊ทธ๋ž˜ํ”ฝ์Šค (7)
      • WebGl (7)
    • AWS (3)
      • aws (3)
    • ๋ฆฌ๋ˆ…์Šค (5)
      • ๋ฆฌ๋ˆ…์Šค (5)
    • ์ฑ… ๋ฆฌ๋ทฐ (13)
      • ํด๋ฆฐ์ฝ”๋“œ(์ฑ…๋ฆฌ๋ทฐ) (3)
      • ์œ ์ง€๋ณด์ˆ˜๊ฐ€๋Šฅํ•œ์ฝ”๋”ฉ์˜๊ธฐ์ˆ C#ํŽธ(์ฑ…๋ฆฌ๋ทฐ) (1)
      • ๋ฆฌํŒฉํ† ๋ง(์ž๋ฐ”์Šคํฌ๋ฆฝํŠธํŒ) (9)
    • Server (2)
      • ๊ฒŒ์ž„ ์„œ๋ฒ„(๋„คํŠธ์›Œํฌ, ๋ฉ€ํ‹ฐ์“ฐ๋ ˆ๋“œ,OS) (2)
    • ์„ค๊ณ„, ์•„ํ‚คํ…์ณ (4)
    • ํŒŒ์ด์ฌ (5)
    • ๋””์ž์ธํŒจํ„ด (2)
    • mocha (2)
    • Jest (1)
    • Spine (1)
    • ์ธ๊ณต์ง€๋Šฅ (1)
      • ํ˜ผ์ž๊ณต๋ถ€ํ•˜๋Š”๋จธ์‹ ๋Ÿฌ๋‹+๋”ฅ๋Ÿฌ๋‹ (1)

๋ธ”๋กœ๊ทธ ๋ฉ”๋‰ด

  • ํ™ˆ
  • ํƒœ๊ทธ
  • ๋ฐฉ๋ช…๋ก

๊ณต์ง€์‚ฌํ•ญ

์ธ๊ธฐ ๊ธ€

ํƒœ๊ทธ

  • MySQL
  • ์œ„์ž„
  • ์ปดํฌ์ง€์…˜
  • ใ…ฃใ„ท

์ตœ๊ทผ ๋Œ“๊ธ€

์ตœ๊ทผ ๊ธ€

ํ‹ฐ์Šคํ† ๋ฆฌ

hELLO ยท Designed By ์ •์ƒ์šฐ.
Rainbow๐ŸŒˆCoder

My dev Note๐Ÿ“’

ํ˜•์ƒ๊ด€๋ฆฌ/Git

[Git] branch ๋”ฐ๊ธฐ

2022. 1. 18. 00:28
728x90

git branch ์ƒ์„ฑ ๋ฐ ํ‘ธ์‹œ : ๋„ค์ด๋ฒ„ ๋ธ”๋กœ๊ทธ (naver.com)

 

 

git branch ์ƒ์„ฑ ๋ฐ ํ‘ธ์‹œ

์—…๋ฌด๋ฅผ ํ•˜๋ฉด์„œ ๊นƒ ๊ณ„์ •์ด ๊ผฌ์ด๋Š” ๋ฐ”๋žŒ์— ๊ตฌ๊ธ€๋ง๋„ ์ฐธ ๋งŽ์ด ํ–ˆ๊ณ  ์ปดํ“จํ„ฐ ํฌ๋งท๋„ ํ–ˆ๋‹ค. ์ธ๊ณ ์˜ ๊ณผ์ •์„ ๊ฑฐ์ณ์„œ...

blog.naver.com

 

Github - Branch ๊ด€๋ฆฌ (Branch ์ƒ์„ฑ, ์ด๋™, ๋ณ‘ํ•ฉ ์‚ญ์ œ) (tistory.com)

 

Github - Branch ๊ด€๋ฆฌ (Branch ์ƒ์„ฑ, ์ด๋™, ๋ณ‘ํ•ฉ ์‚ญ์ œ)

Github์—์„œ ๋‚˜์˜ repo์— branch๋ฅผ ์ƒ์„ฑํ•˜๋ฉด ๋งˆ์น˜ ์›๋ณธ ํŒŒ์ผ์„ 2๊ฐœ๋กœ ๋ณต์‚ฌํ•ด๋†“๋Š” ํšจ๊ณผ์ž…๋‹ˆ๋‹ค. Repository A์— ์žˆ๋Š” ๊ธฐ๋ณธ branch์ธ master branch๊ฐ€ ์žˆ์œผ๋ฉฐ, ์—ฌ๊ธฐ์— ์ถ”๊ฐ€๋กœ test branch๋ฅผ ์ƒ์„ฑํ–ˆ๋‹ค๊ณ  ๊ฐ€์ •ํ•ด๋ด…์‹œ๋‹ค...

cosmosproject.tistory.com

 

๊นƒํ—ˆ๋ธŒ์—์„œ ๋‹ค๋ฅธ ๋ถ„์˜ ๋ ˆํฌ๋ฅผ clone ํ•œ ๋’ค์—

๊ฐœ์ธ ๋ธŒ๋žœ์น˜๋ฅผ ๋”ฐ๊ณ 

commit ํ•œ ๋‹ค์Œ 

๋‹ค์‹œ main branch์— mergeํ•ด์•ผ ํ•  ์ผ์ด ์žˆ์—ˆ๋‹ค.

์œ„ ๋‘ ๋ธ”๋กœ๊ทธ์— ์•ˆ๋‚ด๋œ ๋ฐ”๋Œ€๋กœ ์ฐฌ์ฐฌํžˆ ๋”ฐ๋ผํ–ˆ๋”๋‹ˆ ์ž˜๋˜์—ˆ๋‹ค.

์ฐธ ๊ฐ์‚ฌํ•˜๋‹ค. ๋ณต๋ฐ›์œผ์„ธ์š”.โค๏ธ

 

<์™ธ์šฐ๊ธฐ ์‰ฝ๊ฒŒ ์š”์•ฝ>

 

์„ค๋ช…

์ž…๋ ฅ๊ฐ’

์ถœ๋ ฅ๊ฐ’

$ git pull

 

*ํ˜„์žฌ ๋ธŒ๋žœ์น˜
$ git branch
* ๋ธŒ๋žœ์น˜๋ช…
  main

 

main์— merge
$ git merge main

 

์ปค๋ฐ‹
$ git commit -m ""
On branch ๋ธŒ๋žœ์น˜๋ช…

 

๋ธŒ๋žœ์น˜๋ช…์œผ๋กœ ์ด๋™
$ git checkout ๋ธŒ๋žœ์น˜๋ช…
Already on '๋ธŒ๋žœ์น˜๋ช…'


728x90

'ํ˜•์ƒ๊ด€๋ฆฌ > Git' ์นดํ…Œ๊ณ ๋ฆฌ์˜ ๋‹ค๋ฅธ ๊ธ€

[๊นƒํ—ˆ๋ธŒ ๋ฆฌ๋“œ๋ฏธ] ๊ธฐ์ˆ ์Šคํƒ ์•„์ด์ฝ˜ ์ถ”๊ฐ€ํ•˜๊ธฐ  (0) 2022.05.08
[Git]์ง€์—ญ ์ €์žฅ์†Œ์˜ ํ”„๋กœ์ ํŠธ๋ฅผ ์—…๋กœ๋“œํ•˜๋ ค๋‹ค defualt ๋ธŒ๋Ÿฐ์น˜๋Š” master๊ฐ€ ์•„๋‹ˆ๋ผ origin์ธ ๊ฑด์— ๊ด€ํ•˜์—ฌ  (0) 2022.04.10
๊นƒ ๋ธ”๋กœ๊ทธ ํฌ์ŠคํŒ…ํ•˜๊ธฐ  (0) 2022.01.08
๊นƒ ๋ธ”๋กœ๊ทธ ๊ฐœ์„ค  (0) 2022.01.08
๊นƒ Clone : ๊นƒํ—ˆ๋ธŒ์— ๋กœ์ปฌ ํด๋” ์—ฐ๊ฒฐํ•˜๊ณ  commit, push๊นŒ์ง€  (0) 2022.01.08
    'ํ˜•์ƒ๊ด€๋ฆฌ/Git' ์นดํ…Œ๊ณ ๋ฆฌ์˜ ๋‹ค๋ฅธ ๊ธ€
    • [๊นƒํ—ˆ๋ธŒ ๋ฆฌ๋“œ๋ฏธ] ๊ธฐ์ˆ ์Šคํƒ ์•„์ด์ฝ˜ ์ถ”๊ฐ€ํ•˜๊ธฐ
    • [Git]์ง€์—ญ ์ €์žฅ์†Œ์˜ ํ”„๋กœ์ ํŠธ๋ฅผ ์—…๋กœ๋“œํ•˜๋ ค๋‹ค defualt ๋ธŒ๋Ÿฐ์น˜๋Š” master๊ฐ€ ์•„๋‹ˆ๋ผ origin์ธ ๊ฑด์— ๊ด€ํ•˜์—ฌ
    • ๊นƒ ๋ธ”๋กœ๊ทธ ํฌ์ŠคํŒ…ํ•˜๊ธฐ
    • ๊นƒ ๋ธ”๋กœ๊ทธ ๊ฐœ์„ค
    Rainbow๐ŸŒˆCoder
    Rainbow๐ŸŒˆCoder
    ๋ชฐ๋ผ๋„ ๊ฒฐ๊ตญ์€ ์•„๋Š” ๊ฐœ๋ฐœ์ž, ๊ทธ๋Ÿฐ ์‚ฌ๋žŒ์ด ๋˜๊ธฐ ์œ„ํ•œ ๋งค์ผ์˜ ํ•œ๊ฑธ์Œ

    ํ‹ฐ์Šคํ† ๋ฆฌํˆด๋ฐ”