[Git] 3 way merge ์ดํ•ดํ•˜๊ธฐ

2022. 4. 19. 14:12ยท๐Ÿ‘ฉ๐Ÿป‍๐Ÿ’ปSTUDY/Git

https://wonyong-jang.github.io/git/2021/02/05/Github-Merge.html

 

[Git] Merge(3-way merge) ์ดํ•ดํ•˜๊ธฐ - SW Developer

๋‹ค๋ฅธ ํ˜•์ƒ ๊ด€๋ฆฌํˆด๋“ค๊ณผ๋Š” ๋‹ฌ๋ฆฌ git์€ branch๋ฅผ ์ƒ์„ฑํ•  ๋•Œ ํŒŒ์ผ์„ ๋ณต์‚ฌํ•˜๋Š” ๊ฒƒ์ด ์•„๋‹ˆ๋ผ ํŒŒ์ผ์˜ ์Šค๋ƒ…์ƒท๋งŒ ๊ฐ€์ง€๊ณ  ์ƒ์„ฑํ•˜๊ธฐ ๋•Œ๋ฌธ์— ์ž์›์˜ ๋ถ€๋‹ด์—†์ด branch๋ฅผ ๋งŒ๋“ค์–ด ์‚ฌ์šฉํ•  ์ˆ˜ ์žˆ๋‹ค. ์ด๋Ÿฌํ•œ ์žฅ์  ๋•Œ๋ฌธ

wonyong-jang.github.io

 

๊ฐœ๋… ์‰ฝ๊ฒŒ ์ •๋ฆฌ๋˜์–ด ์žˆ๋‹ค.

์ €์ž‘์žํ‘œ์‹œ ๋น„์˜๋ฆฌ ๋™์ผ์กฐ๊ฑด (์ƒˆ์ฐฝ์—ด๋ฆผ)
'๐Ÿ‘ฉ๐Ÿป‍๐Ÿ’ปSTUDY/Git' ์นดํ…Œ๊ณ ๋ฆฌ์˜ ๋‹ค๋ฅธ ๊ธ€
  • [Git] ์ €์žฅ์†Œ์— ๋”ฐ๋ฅธ ๊ธ€๋กœ๋ฒŒ, ๋กœ์ปฌ ์œ ์ € ๋ณ€๊ฒฝํ•˜๊ธฐ
  • [Git] Git push ์˜ค๋ฅ˜ํ•ด๊ฒฐ
  • [Git] origin/master vs origin master์˜ ๋‹ค๋ฅธ์ 
  • [Git] remote์— ์ด๋ฏธ pushํ•œ ํŒŒ์ผ ์ง€์šฐ๊ธฐ
jmjm
jmjm
  • jmjm
    /* jmjmjm */
    jmjm
  • ์ „์ฒด
    ์˜ค๋Š˜
    ์–ด์ œ
    • ๋ถ„๋ฅ˜ ์ „์ฒด๋ณด๊ธฐ (140)
      • ๐Ÿ‘ฉ๐Ÿป‍๐Ÿ’ปSTUDY (101)
        • HTML (9)
        • CSS (25)
        • SASS (4)
        • JavaScript (19)
        • jQuery (9)
        • Publishing (8)
        • Git (11)
        • React (14)
        • Vue (0)
        • ์›น์ ‘๊ทผ์„ฑ (1)
        • Gulp (1)
      • ๐ŸฃcodeLab (28)
      • ๐ŸŒˆetc (8)
      • ๐Ÿฅฐ ์ผ์ƒ (2)
      • ๐ŸŒŸ์ฝ์–ด๋ณด๊ธฐ (1)
  • ๋ธ”๋กœ๊ทธ ๋ฉ”๋‰ด

    • ํ™ˆ
    • ํƒœ๊ทธ
  • ๋งํฌ

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

  • ์ธ๊ธฐ ๊ธ€

  • ํƒœ๊ทธ

    javascript nodelist
    css ๊ฐ€์ƒ์„ ํƒ์ž
    sticky jsfiddle
    ๋ง์ค„์ž„ tooltip
    sass
    javascript htmlcollection
    css ํ˜•์ œ์ธ์ ‘์ž ์•ˆ๋ผ์š”
    html collection
    javascript ์ปฌ๋ ‰์…˜
    sass compiler
    ๊ตฌ์กฐ๋ถ„ํ•ดํ• ๋‹น ์ข…๋ฅ˜
    ๋ง์ค„์ž„ ํ˜ธ๋ฒ„
    ํ˜•์ œ์ธ์ ‘์ž
    ํ˜•์ œ์ธ์ ‘์ž ์•ˆ๋˜๋Š” ์ด์œ 
    ์›น์ ‘๊ทผ์„ฑ
    react import export
    ๋ง์ค„์ž„ hover
    HTML Form
    javascript htmlcollection nodelist
    ์ž๋ฐ”์Šคํฌ๋ฆฝํŠธ ์ปฌ๋ ‰์…˜
    ์ž๋ฐ”์Šคํฌ๋ฆฝํŠธ ํ‘œํ˜„์‹๋ฌธ
    ์ž๋ฐ”์Šคํฌ๋ฆฝํŠธ ๊ตฌ์กฐ๋ถ„ํ•ดํ• ๋‹น
    ์ž๋ฐ”์Šคํฌ๋ฆฝํŠธ ํ‘œํ˜„์‹ ๋ฌธ
    CSS ์„ ํƒ์ž
    ๋ง์ค„์ž„ ํˆดํŒ
    ํ˜•์ œ์ธ์ ‘์ž display none
    ์•„์ฝ”๋””์–ธ๋ฉ”๋‰ด
    vscode ๋‹จ์ถ•ํ‚ค
    css flex
    javascript ๊ตฌ์กฐ๋ถ„ํ•ดํ• ๋‹น
  • ์ตœ๊ทผ ๋Œ“๊ธ€

  • ์ตœ๊ทผ ๊ธ€

  • hELLOยท Designed By์ •์ƒ์šฐ.v4.10.3
jmjm
[Git] 3 way merge ์ดํ•ดํ•˜๊ธฐ
์ƒ๋‹จ์œผ๋กœ

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