Hoon Blog

[Git] 4. branch & merge

๐Ÿš€ branch ๋ฅผ ์‚ฌ์šฉํ•˜๋Š” ์ด์œ  ํ”„๋กœ์ ํŠธ๋ฅผ ์—ฌ๋Ÿฌ ๋ฒ„์ „์œผ๋กœ ๊ด€๋ฆฌํ•˜๊ธฐ ์œ„ํ•ด ์‹ค๋ฐฐํฌ์šฉ, ํ…Œ์ŠคํŠธ์šฉ, ๊ธฐ๋Šฅ์ถ”๊ฐ€ ๋“ฑ ์—ฌ๋Ÿฌ ์ž‘์—…๋“ค์ด ๊ฐ๊ฐ ๋…๋ฆฝ๋˜์–ด ์ง„ํ–‰๋  ๋•Œ ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ, ๊ฒŒ์‹œํŒ ๊ธฐ๋Šฅ, ์ฝ”๋“œ ์ˆ˜์ •โ€ฆ ๊ฐ๊ฐ์˜ branch ์—์„œ ์ž‘์—…ํ•œ ๋’ค ํ™•์ •๋œ ๊ฒƒ์„ main branch์— merge ...

[Git] 3. reset & revert

๐Ÿš€ ์ฐจ์ด์  ๋ช…๋ น์–ด ๋ชฉ์  ์ž‘๋™ ๋ฐฉ์‹ ํžˆ์Šคํ† ๋ฆฌ reset ์ปค๋ฐ‹ ์ž์ฒด๋ฅผ ์—†์• ๊ฑฐ๋‚˜ ๋˜๋Œ๋ฆผ ๋ธŒ๋žœ์น˜ HEAD๋ฅผ ๊ณผ๊ฑฐ ์ปค๋ฐ‹์œผ๋กœ ์ด๋™ ํžˆ์Šคํ† ๋ฆฌ ์ˆ˜์ •๋จ revert ๋˜๋Œ๋ฆฌ๋Š” ์ƒˆ ์ปค๋ฐ‹์„ ์ƒ์„ฑ ...

[Git] 2. Git ์ปจ๋ฒค์…˜

๐Ÿš€ Git Commit Convention ๊ธฐ๋ณธ ํ˜•์‹ <type>(scope)?: <subject> <body> <footer> type: ์ปค๋ฐ‹์˜ ๋ชฉ์  scope: (์„ ํƒ์‚ฌํ•ญ) ์–ด๋–ค ๋ชจ๋“ˆ/๊ธฐ๋Šฅ/๋””๋ ‰ํ† ๋ฆฌ์™€ ๊ด€๋ จ๋œ ์ปค๋ฐ‹์ธ์ง€ subject: ํ•œ ์ค„ ์ œ๋ชฉ (๋ช…๋ นํ˜•) body: (์„ ํƒ์‚ฌํ•ญ...

[๋ฏธ๋‹ˆํ”„๋กœ์ ํŠธ] ํŒŒ์ด์–ด๋ฒ ์ด์Šค๋ฅผ ์ด์šฉํ•œ ๋Œ“๊ธ€ ๊ธฐ๋Šฅ ์ƒ˜ํ”Œ ์ œ์ž‘

๐Ÿš€ JS ์ฝ”๋“œ // Firebase SDK ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ๊ฐ€์ ธ์˜ค๊ธฐ import { initializeApp } from "https://www.gstatic.com/firebasejs/9.22.0/firebase-app.js"; import { getFirestore, collection, doc, addDoc, ...

๋‚ด์ผ๋ฐฐ์›€์บ ํ”„ ์‚ฌ์ „์บ ํ”„ JAVA ํ•ต์‹ฌ ๊ธฐ๋ณธ ๊ฐœ๋…

๐Ÿš€ Java ๊ธฐ๋ณธ ๊ตฌ์กฐ public class HelloWorld { public static void main(String[] args) { System.out.println("Hello, world!"); } } class: ํด๋ž˜์Šค(์„ค๊ณ„๋„) main(): ํ”„๋กœ๊ทธ๋žจ์˜ ์‹œ์ž‘์  (์ž๋ฐ”๋Š” ๋ฐ˜๋“œ์‹œ main() ์—์„œ...

๋‚ด์ผ๋ฐฐ์›€์บ ํ”„ ์‚ฌ์ „์บ ํ”„ JAVA ํ€˜์ŠคํŠธ ๋‹ฌ๋ฆฌ๊ธฐ๋ฐ˜ ๋ณด๋„ˆ์Šค ๋ฌธ์ œ

๐Ÿš€ ๋ฌธ์ œ ๊ฐ€์œ„๋ฐ”์œ„๋ณด ๊ฒŒ์ž„ ๋งŒ๋“ค๊ธฐ ์ด 5ํŒ ์ง„ํ–‰ํ•˜๋ฉฐ, ์Šน๋ฆฌํ•œ ํšŸ์ˆ˜์— ๋”ฐ๋ผ ๊ฒฝํ’ˆ์„ ํš๋“ ๐Ÿš€ ์ •๋‹ต import java.util.HashMap; import java.util.Map; import java.util.Scanner; import java.util.Random; public class RpsGif...

๋‚ด์ผ๋ฐฐ์›€์บ ํ”„ ์‚ฌ์ „์บ ํ”„ JAVA ํ€˜์ŠคํŠธ ๋‹ฌ๋ฆฌ๊ธฐ๋ฐ˜ 3๋ฒˆ

๐Ÿš€ ๋ฌธ์ œ ์ปดํ“จํ„ฐ๊ฐ€ ๋žœ๋ค์œผ๋กœ ์„ ํƒํ•œ ์˜์–ด๋‹จ์–ด๋ฅผ 9๋ฒˆ์˜ ๊ธฐํšŒ ์•ˆ์— ํ•œ ๊ธ€์ž์”ฉ ์ž…๋ ฅํ•˜์—ฌ ๋งž์ถ”๋Š” ๊ฒŒ์ž„ ์ปดํ“จํ„ฐ๊ฐ€ ๋žœ๋ค์œผ๋กœ ์˜์–ด๋‹จ์–ด๋ฅผ ์„ ํƒํ•ฉ๋‹ˆ๋‹ค. ์˜์–ด๋‹จ์–ด์˜ ์ž๋ฆฌ์ˆ˜๋ฅผ ์•Œ๋ ค์ค๋‹ˆ๋‹ค. ex) PICTURE = 7์ž๋ฆฌ => _ _ _ _ _ _ _ ์‚ฌ์šฉ์ž๋Š” A ๋ถ€ํ„ฐ Z ๊นŒ์ง€์˜ ์•ŒํŒŒ๋ฒณ ์ค‘์—์„œ ํ•˜๋‚˜๋ฅผ ์ž…๋ ฅํ•ฉ๋‹ˆ๋‹ค....

๋‚ด์ผ๋ฐฐ์›€์บ ํ”„ ์‚ฌ์ „์บ ํ”„ JAVA ํ€˜์ŠคํŠธ ๋‹ฌ๋ฆฌ๊ธฐ๋ฐ˜ 2๋ฒˆ

๐Ÿš€ ๋ฌธ์ œ ์žํŒ๊ธฐ ๋งŒ๋“ค๊ธฐ ์‚ฌ์ด๋‹ค 1,700์› ์ฝœ๋ผ 1,900์› ์‹ํ˜œ 2,500์› ์†”์˜๋ˆˆ 3,000์› Map, Scanner ์‚ฌ์šฉ ๐Ÿš€ ์ •๋‹ต import java.util.Map; import java.util.Scanner; public class Main { pu...

๋‚ด์ผ๋ฐฐ์›€์บ ํ”„ ์‚ฌ์ „์บ ํ”„ JAVA ํ€˜์ŠคํŠธ ๋‹ฌ๋ฆฌ๊ธฐ๋ฐ˜ 1๋ฒˆ

๐Ÿš€ ๋ฌธ์ œ ์•„๋ž˜ ํ‚ค์›Œ๋“œ๋ฅผ ์‚ฌ์šฉํ•˜์—ฌ ์ตœ์†Œ 27๊ฐ€์ง€ ์ด์ƒ์˜ ๋‹‰๋„ค์ž„ ์ค‘ ํ•˜๋‚˜๋ฅผ ๋žœ๋ค์œผ๋กœ ์ถœ๋ ฅํ•˜๋Š” JAVA ์ฝ”๋“œ ๋งŒ๋“ค๊ธฐ ๊ธฐ์ ˆ์ดˆํ’, ๋ฉ‹์žˆ๋Š”, ์žฌ๋ฏธ์žˆ๋Š” ๋„์ „์ ์ธ, ๋…ธ๋ž€์ƒ‰์˜, ๋ฐ”๋ณด๊ฐ™์€ ๋Œ๊ณ ๋ž˜, ๊ฐœ๋ฐœ์ž, ์˜ค๋ž‘์šฐํƒ„ ๐Ÿš€ ์ •๋‹ต import java.util.Random; public class Rando...

ยฉ Hoon. Some rights reserved.