๐Ÿธ ์ •๋ณด 4

[Git: error] failed to push some refs to~ Error ํ•ด๊ฒฐ ๋ฐฉ

์†Œ์†Œํ•˜๊ฒŒ ๋ฌธ์ œ๋ฅผ ํ’€๋‹ค๊ฐ€ ๋กœ์ปฌ ์ €์žฅ์†Œ์—์„œ ๊นƒํ—ˆ๋ธŒ์˜ ์›๊ฒฉ ์ €์žฅ์†Œ๋กœ ์˜ฌ๋ฆฌ๋ ค๋Š”๋ฐ ํ‰์†Œ์™€ ๊ฐ™์€ ๋ช…๋ น์–ด๋ฅผ ์ณค๋Š”๋ฐ๋„ (add.. commit...push ....) ๊ฐ‘์ž๊ธฐ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค. hint๋ฅผ ๋ณด๋‹ˆ ์ตœ์‹  ์ƒํƒœ๋ฅผ pull ํ•ด์˜ค๋ผ๊ณ  ํ•˜๋„ค์š”. $ git pull origin BranchName(ex. master, main) $ git push origin BranchName ์ €๋Š” ๋‹คํ–‰ํžˆ ์ด ๋ฐฉ๋ฒ•์œผ๋กœ ํ•ด๊ฒฐ์ด ๋๋Š”๋ฐ, ๋งŒ์•ฝ conflict๊ฐ€ ๋ฐœ์ƒํ•˜๊ฑฐ๋‚˜ ๋‹ค๋ฅธ ๋ฌธ์ œ๋กœ pull์ด ์•ˆ ๋˜๋Š” ๊ฒฝ์šฐ๋„ ์žˆ๋Š”๋ฐ, ์ด๋•Œ ์ถฉ๋Œํ•œ ์ฝ”๋“œ ์ค‘ ์ง์ ‘ ํ™•์ธํ•˜๊ณ  ์„ ํƒํ•˜๊ณ  ์‹ถ๋‹ค๋ฉด ์ง์ ‘ ์›์ธ์„ ๊ณ ์ณ์ฃผ๊ณ  ๋ณ‘ํ•ฉํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค. (conflict resolve) merge๋Š” ๋ณต์žกํ•˜๊ณ  ์–ด๋ ค์›Œ์„œ ์ •ํ™•ํžˆ ์•Œ๊ฒŒ ๋˜๋ฉด ์ •๋ฆฌํ•ด์•ผ๋  ๊ฒƒ ๊ฐ™์•„์š”. ๐Ÿ˜‘ ์ด๋Ÿฐ๊ฑด ํ•„์š” ์—†๊ณ ..

์›น์—๋””ํ„ฐ WEB Editor "Brackets" ์‚ฌ์šฉํ•ด๋ณด๊ธฐ (์„ค์น˜/ํ™•์žฅ๊ธฐ๋Šฅ/๋‹จ์ถ•ํ‚ค)

๐Ÿ“Œ ๋น ๋ฅธ ๋ฐ”๋กœ๊ฐ€๊ธฐ Brackets ์„ค์น˜ ํ™•์žฅ ๊ธฐ๋Šฅ ๋‹จ์ถ•ํ‚ค ์ฒซ ์›น ํ”„๋กœ์ ํŠธ๋Š” ์•„ํ†ฐ(Atom)์œผ๋กœ, ์ƒํ™œ์ฝ”๋”ฉ ์‹ค์Šต์šฉ์œผ๋ก  Sublime Text๋ฅผ ๋ฅผ ์ผ์—ˆ๋Š”๋ฐ ๋‚ด๋ถ€ ๊ธฐ๋Šฅ์„ ๊นŠ๊ฒŒ ์‚ฌ์šฉํ•ด๋ณธ ๊ฑด ์•„๋‹ˆ๋ผ ๋ช…ํ™•ํ•œ ์žฅ๋‹จ์ ์€ ๋ชป ๋Š๊ผˆ์Šต๋‹ˆ๋‹ค. ๋‹ค๋งŒ Sublime์ด Atom์— ๋น„ํ•ด ์ข€ ๋” ๊ฐ€๋ฒผ์šด(?) ๋Š๋‚Œ์ด ๋“ค์—ˆ๋˜ ๊ฒƒ ๊ฐ™์•„์š”. ์ด๋ฒˆ์— ์ž๋ฐ”์Šคํฌ๋ฆฝํŠธ ๊ณต๋ถ€๋ฅผ ์‹œ์ž‘ํ–ˆ๋Š”๋ฐ ์ƒˆ ์—๋””ํ„ฐ๋„ ์‚ฌ์šฉํ•ด๋ณผ ๊ฒธ ๋ธŒ๋ž˜ํ‚ท์ฆˆ(Brackets)๋ฅผ ์„ค์น˜ํ•ด๋ดค์Šต๋‹ˆ๋‹ค! 1. Brackets ์„ค์น˜ Brackets์„ ์„ค์น˜ํ•ด๋ณด์ž ๋‹ค์šด๋กœ๋“œ ๋งํฌ: https://brackets.softonic.kr/download Brackets ์›น ๋””์ž์ด๋„ˆ๋ฅผ์œ„ํ•œ ๋ฌด๋ฃŒ ํ…์ŠคํŠธ ํŽธ์ง‘๊ธฐ brackets.softonic.kr ์œ„ ๋งํฌ ๋“ค์–ด๊ฐ€๋ฉด ๋‹ค์Œ๊ณผ ๊ฐ™์€ ์ฐฝ์ด ๋œจ๋Š”๋ฐ์š” ์ดˆ๋ก์ƒ‰ ๋ฐ•์Šค '๋ฌด๋ฃŒ ๋‹ค..

[๋ฆฌ๋ˆ…์Šค] vim colorscheme ์„ค์น˜ (+ํ—ˆ๊ฐ€ ๊ฑฐ๋ถ€ error)

์šด์˜์ฒด์ œ ๊ฐ•์˜๋ฅผ ๋“ฃ๊ธฐ ์œ„ํ•ด ๊ฐ€์ƒ๋จธ์‹ ์„ ์‚ฌ์šฉํ•˜์—ฌ ๋ฆฌ๋ˆ…์Šค ํ™˜๊ฒฝ์„ ์ ‘ํ•ด๋ดค๋Š”๋ฐ, ์กฐ๊ธˆ ๋” ์˜ˆ์œ ์—๋””ํ„ฐ์—์„œ ์ฝ”๋”ฉ์„ ํ•˜๊ธฐ ์œ„ํ•ด vim colorscheme ๋ฅผ ์จ๋ณด๊ธฐ๋กœ ํ–ˆ์Šต๋‹ˆ๋‹ค! 1. colorscheme ๋‹ค์šด๋กœ๋“œ ์—ฌ๋Ÿฌ๊ฐ€์ง€ ์ƒ‰์ƒ ํ…Œ๋งˆ๊ฐ€ ์žˆ๋Š”๋ฐ, ๋งŽ์€ ๋ถ„๋“ค์ด ์‚ฌ์šฉํ•˜์‹œ๋Š” jellybeans๋ฅผ ์‚ฌ์šฉํ•ด๋ณด๋ ค ํ•ฉ๋‹ˆ๋‹ค. ์ƒ‰์ƒ์ด ๋งˆ์Œ์— ์•ˆ๋“œ์‹ ๋‹ค๋ฉด ๋‹ค๋ฅธ ํ…Œ๋งˆ๋ฅผ ์ฐพ์•„๋ณด์…”๋„ ์ข‹์Šต๋‹ˆ๋‹ค! www.vim.org/scripts/script.php?script_id=2555 jellybeans.vim - Colorful, dark color scheme : vim online www.vim.org 2. vim ํด๋”๋กœ ์ด๋™ ๋‹ค์šด๋ฐ›์€ .vimํŒŒ์ผ์„ vim์ด ์„ค์น˜๋œ ๊ฒฝ๋กœ๋กœ ์ด๋™์‹œ์ผœ์•ผ ํ•ฉ๋‹ˆ๋‹ค. vim ์„ค์น˜ ๊ฒฝ๋กœ ํ™•์ธ ์ž์‹ ์˜ vim์ด ์„ค์น˜๋œ ๊ฒฝ๋กœ๋ฅผ ์ฐพ..

๊ณผ์ œํ•  ๋•Œ ์›Œ๋“œ(Word) ํŒŒ์ผ์— ์ฝ”๋“œ ๋ณด๊ธฐ์ข‹๊ฒŒ ๋ถ™์—ฌ๋„ฃ๊ธฐ

๊ณผ์ œ๋ฅผ ํ•˜๋‹ค ๋ณด๋ฉด ์†Œ์Šค ํŒŒ์ผ์„ ๋ณด๊ณ ์„œ์™€ ์••์ถ•ํ•ด์„œ ์ œ์ถœํ•˜๋ผ๋Š” ๊ต์ˆ˜๋‹˜๊ณผ ๋ณด๊ณ ์„œ ์•ˆ์— ๋ณต์‚ฌ+๋ถ™์—ฌ ๋„ฃ๊ธฐ๋กœ ์ œ์ถœํ•˜๋ผ๋Š” ๊ต์ˆ˜๋‹˜์ด ๊ณ„์‹ญ๋‹ˆ๋‹ค. ์•„๋ฌด๊ฒƒ๋„ ๋ชฐ๋ž๋˜ 1,2ํ•™๋…„์—” ์›Œ๋“œ ํŒŒ์ผ์— ํ‘๋ฐฑ์œผ๋กœ ๋ถ™์—ฌ ๋„ฃ์—ˆ๋Š”๋ฐ, ์‚ฌ์‹ค ๊ทธ๋•Œ๋Š” ์ด๋ ‡๊ฒŒ ๋ณด๊ธฐ ํž˜๋“ ๊ฑธ ์ˆ˜์‹ญ ๊ฐœ๋ฅผ ๋ณด์‹œ๊ณ  ์ฑ„์ ํ•˜์‹œ๋Š” ๊ต์ˆ˜๋‹˜์ด ๋Œ€๋‹จํ•˜์‹œ๋‹ค๊ณ ๋งŒ ์ƒ๊ฐํ–ˆ์–ด์š”. ์กฐ๊ธˆ๋งŒ ๊ฒ€์ƒ‰ํ•ด๋„ ์ด๋ ‡๊ฒŒ ์ข‹์€ ์‚ฌ์ดํŠธ๊ฐ€ ๋‚˜์˜ค๋Š”๋ฐ... pygments.org/demo/ Demo — Pygments Demo - Try it out! The highlighting here is performed in-browser using a WebAssembly translation of the latest Pygments master branch, courtesy of Pyodide. Your content is..