๐ŸŒฑ ๐ฃ๐ฃ๐ข๐ง๐ ๐ฅ๐ž ๐๐ž๐•๐ฅ๐จ๐ 

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

COMMIT 1

[git] ์—ฐ๊ด€ ์—†๋Š” ์ปค๋ฐ‹ ๋ณ‘ํ•ฉ ์˜ค๋ฅ˜ | fatal: refusing to merge unrelated histories

๋ฌธ์ œ ์ƒํ™ฉ ๋กœ์ปฌ์— ํ”„๋กœ์ ํŠธ ์ƒ์„ฑ git init + init commit ๊นƒํ—ˆ๋ธŒ์—์„œ ๋ ˆํŒŒ์ง€ํ† ๋ฆฌ ์ƒ์„ฑ + readme initial commit ๋‘ ๊ฐœ์˜ ์„œ๋กœ ๋‹ค๋ฅธ ์‹œ์ž‘์  commit์œผ๋กœ ๋จธ์ง€ ๋ถˆ๊ฐ€๋Šฅ ์—๋Ÿฌ ๋ฉ”์„ธ์ง€ fatal : refusing to merge unrelated histories. ํ•ด๊ฒฐ ๋ฐฉ๋ฒ• ์„œ๋กœ ๊ด€๋ จ ์—†๋Š” ์ปค๋ฐ‹์˜ ๋จธ์ง€ ํ—ˆ์šฉ ๋ช…๋ น์–ด ์ ์šฉ --allow-unrelated-histories ex.) ๋จธ์ง€ ์ปค๋ฐ‹ i ) vim edit mode ๋ฉ”์„ธ์ง€ ์ž‘์„ฑ esc ) to quit input mode :wq ) save(wrote) and quiet ํ•ด๊ฒฐ ์™„๋ฃŒ ์ฐธ๊ณ  https://gdtbgl93.tistory.com/63 Git push๊ฐ€ ์•ˆ๋˜๋Š” ๊ฒฝ์šฐ (fatal: refusing to merge ..

Error-log 2024.03.18
์ด์ „
1
๋‹ค์Œ
ํ”„๋กœํ•„์‚ฌ์ง„

์˜ค๋Š˜ ๋ฐฐ์šด ๊ฒƒ, ์˜ค๋Š˜ ์ƒ๊ธด ์ด์Šˆ์— ๋Œ€ํ•ด ๊ธฐ๋กํ•ฉ๋‹ˆ๋‹ค. *3*

  • ๋ถ„๋ฅ˜ ์ „์ฒด๋ณด๊ธฐ (132)
    • ์•Œ๊ณ ๋ฆฌ์ฆ˜ (18)
    • JAVA (10)
    • JavaScript (4)
    • React (3)
    • Next.js (5)
    • Python (2)
    • DataBase (0)
    • Docker (1)
    • TIL (9)
    • Linux (0)
    • Project (10)
    • Error-log (5)
    • etc (3)
    • software engineering (62)
      • ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค์„ค๊ณ„ (11)
      • ์ •๋ณดํ†ต์‹ ๊ฐœ๋ก  (6)
      • ์ปดํ“จํ„ฐํ•™๊ฐœ๋ก  (7)
      • ์ปดํ“จํ„ฐ๋„คํŠธ์›Œํฌ (9)
      • ์†Œํ”„ํŠธ์›จ์–ด๊ฐœ๋ฐœ๋ณด์•ˆ (7)
      • ๋น…๋ฐ์ดํ„ฐ ์ฒ˜๋ฆฌ (14)
      • ํŒŒ์ด์ฌ ๋จธ์‹ ๋Ÿฌ๋‹ (8)

Tag

docker, GIT, Next.js, ์•Œ๊ณ ๋ฆฌ์ฆ˜, eclipse, list, SPARK, server component, ๋น„์ง€๋„ํ•™์Šต, sourcetree, server, collection, client component, TCP, socket.send, SSR, React, WebSocket, tomcat, ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค,

์ตœ๊ทผ๊ธ€๊ณผ ์ธ๊ธฐ๊ธ€

  • ์ตœ๊ทผ๊ธ€
  • ์ธ๊ธฐ๊ธ€

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

Archives

Calendar

  2025. 06  
์ผ ์›” ํ™” ์ˆ˜ ๋ชฉ ๊ธˆ ํ† 
1 2 3 4 5 6 7
8 9 10 11 12 13 14
15 16 17 18 19 20 21
22 23 24 25 26 27 28
29 30

๋ฐฉ๋ฌธ์ž์ˆ˜Total

  • Today :
  • Yesterday :

๐Ÿƒ๐—ฑ๐—ผ ๐—ถ๐˜ ๐—ฏ๐—ฒ๐—ฐ๐—ฎ๐˜‚๐˜€๐—ฒ ๐—ถ๐˜ ๐—บ๐—ฎ๐—ธ๐—ฒ๐˜€ ๐˜†๐—ผ๐˜‚ ๐—ต๐—ฎ๐—ฝ๐—ฝ๐˜†๐ŸŒฟ

๐—–๐—ผ๐—ฝ๐˜†๐—ฟ๐—ถ๐—ด๐—ต๐˜ ยฉ ๐—ท๐—ท๐—ถ๐—ป๐—ด๐—น๐—ฒ. ๐—”๐—น๐—น ๐—ฟ๐—ถ๐—ด๐—ต๐˜๐˜€ ๐—ฟ๐—ฒ๐˜€๐—ฒ๐—ฟ๐˜ƒ๐—ฒ๐—ฑ.

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

๋‹จ์ถ•ํ‚ค

๋‚ด ๋ธ”๋กœ๊ทธ

๋‚ด ๋ธ”๋กœ๊ทธ - ๊ด€๋ฆฌ์ž ํ™ˆ ์ „ํ™˜
Q
Q
์ƒˆ ๊ธ€ ์“ฐ๊ธฐ
W
W

๋ธ”๋กœ๊ทธ ๊ฒŒ์‹œ๊ธ€

๊ธ€ ์ˆ˜์ • (๊ถŒํ•œ ์žˆ๋Š” ๊ฒฝ์šฐ)
E
E
๋Œ“๊ธ€ ์˜์—ญ์œผ๋กœ ์ด๋™
C
C

๋ชจ๋“  ์˜์—ญ

์ด ํŽ˜์ด์ง€์˜ URL ๋ณต์‚ฌ
S
S
๋งจ ์œ„๋กœ ์ด๋™
T
T
ํ‹ฐ์Šคํ† ๋ฆฌ ํ™ˆ ์ด๋™
H
H
๋‹จ์ถ•ํ‚ค ์•ˆ๋‚ด
Shift + /
โ‡ง + /

* ๋‹จ์ถ•ํ‚ค๋Š” ํ•œ๊ธ€/์˜๋ฌธ ๋Œ€์†Œ๋ฌธ์ž๋กœ ์ด์šฉ ๊ฐ€๋Šฅํ•˜๋ฉฐ, ํ‹ฐ์Šคํ† ๋ฆฌ ๊ธฐ๋ณธ ๋„๋ฉ”์ธ์—์„œ๋งŒ ๋™์ž‘ํ•ฉ๋‹ˆ๋‹ค.