Skip to content

SSAFYDaejeon6/Algorithm

Repository files navigation

SSAFY 11๊ธฐ ๋Œ€์ „ 6๋ฐ˜ ์•Œ๊ณ ๋ฆฌ์ฆ˜ ์Šคํ„ฐ๋””

์Šคํ„ฐ๋”” ๋ฉค๋ฒ„

๊นƒย ํ—ˆย ๋ธŒ korno1 alexย -ย koko djleeasi hjย -ย k66 stoneTiger0912 wlsdn2749 Jungjaehee honggyeonghyeon
๋ฐฑย ์ค€ korno1 backalex djleeasi hjx06 dltjrqja1 wlsdn2749 wjdwogml5890 hyeon21owo
์–ธย ์–ด



์˜ค๋Š˜์˜ ๋ฌธ์ œ (2024-07-05)

์ˆœ๋ฒˆ ๋ฌธ์ œ ๋ฒˆํ˜ธ ๋ฌธ์ œ ์ด๋ฆ„ ๋‚œ์ด๋„ ๋งํฌ ์‚ฌ์ดํŠธ
00 24954 ๋ฌผ์•ฝ ๊ตฌ๋งค S1 24954 ๋ฐฑ์ค€

๊ทœ์น™

1. ์ผ์ฃผ์ผ์— 3๋ฌธ์ œ๋ฅผ ์ •ํ•˜๊ณ  ์›”, ์ˆ˜, ๊ธˆ 23:59๋ถ„ ๊ธฐ์ค€ ์ œ์ถœ
2. ๋‚œ์ด๋„๋Š” ๋ฐฑ์ค€ ๊ณจ๋“œ 3 ~ 5 ์ˆ˜์ค€์˜ ๋ฌธ์ œ
3. ํ”Œ๋žซํผ์€ ๋ฐฑ์ค€, SWEA, ํ”„๋กœ๊ทธ๋ž˜๋จธ์Šค
4. ๋ฌธ์ œ ์„ ํƒ์€ ๋ฒˆ๊ฐˆ์•„๊ฐ€๋ฉด์„œ
5. ์–ธ์–ด๋Š” ๋ฌด์กฐ๊ฑด ์ž๋ฐ”๋กœ ํ’€๊ณ  ๋‹ค๋ฅธ ์–ธ์–ด๋Š” ๊ฐœ์ธ์ ์œผ๋กœ ํ’€๊ธฐ
6. ๊ฐ์ž ์ฝ”๋“œ๋ฅผ github์— ์˜ฌ๋ฆฌ๊ธฐ
8. ์˜ฌ๋ฆฐ ์ฝ”๋“œ๋Š” Notion์—๋„ ๋งํฌํ•˜๊ธฐ
9. ๊ถ๊ธˆํ•œ ์ ์„ ์˜ฌ๋ฆฌ๊ฑฐ๋‚˜ ๋‹ค๋ฅธ ์‚ฌ๋žŒ ์ฝ”๋“œ์—์„œ ๊ถ๊ธˆํ•œ ๋ถ€๋ถ„์„ ์งˆ๋ฌธํ•ด์ฃผ์„ธ์š”!
10. ๋ฌธ์ œ๋ฅผ ์•ˆํ’€๊ฒฝ์šฐ ๋ฒŒ๊ธˆ 1000์›, ๋ชปํ’€๊ฒฝ์šฐ๋Š” ๊ตฌ๊ธ€๋ง ํ•ด์„œ ์ดํ•ดํ•˜๊ณ  ์˜ค๊ธฐ

๊นƒํ—ˆ๋ธŒ ๊ด€๋ จ ์ฃผ์˜ํ•  ์ 

1. ๊ฐœ์ธ forkํ•œ ์ €์žฅ์†Œ์—์„œ ๋ธŒ๋žœ์น˜๋Š” ์ž์œ ๋กญ๊ฒŒ ๋งŒ๋“ค์–ด๋„ ๋˜์ง€๋งŒ pull-request์‹œ์—๋Š” ์ค‘์•™ ์ €์žฅ์†Œ์™€ ๋งž์•„์•ผ ํ•จ
	- ํ•˜๋‚˜์˜ ๋ธŒ๋žœ์น˜๋กœ ์“ฐ๋Š”๊ฒƒ์„ ์ถ”์ฒœ
2. ์ค‘์•™ ์ €์žฅ์†Œ๋Š” ๋ฐ˜๋“œ์‹œ main ๋ธŒ๋žœ์น˜๋งŒ ์‚ฌ์šฉํ•˜๊ณ  master ๋ธŒ๋žœ์น˜๋‚˜ ๋‹ค๋ฅธ ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ X
3. (๋งค์šฐ ์ค‘์š”) ๊นƒํ—ˆ๋ธŒ commit์ด๋‚˜ merge๊ฐ€ ์•ˆ๋  ์‹œ ํ˜ผ์ž ํ•ด๊ฒฐํ•˜๋ ค ํ•˜์ง€ ๋ง๊ณ  ์ œ๋ฐœ ๊ณต์œ ํ•  ๊ฒƒ

์ €์žฅ์†Œ ์—ฐ๊ฒฐ

1. ํ˜„์žฌ ๋ ˆํฌ์ง€ํ† ๋ฆฌ(์ค‘์•™์ €์žฅ์†Œ)๋ฅผ ๊ฐœ์ธ ์ €์žฅ์†Œ๋กœ fork (์›๊ฒฉ ์ €์žฅ์†Œ)
2. forkํ•œ ์ €์žฅ์†Œ๋ฅผ clone
	- ex) git clone https://github.com/korno1/Algorithm_ssafy.git
3. git remote -v ๋กœ origin์— forkํ•œ ์ €์žฅ์†Œ ํ™•์ธ
4. ์ค‘์•™ ์ €์žฅ์†Œ ์ถ”๊ฐ€ (upstream)
	- git remote add upstream https://github.com/SSAFYDaejeon6/Algorithm.git

์ปค๋ฐ‹ ๋ฐฉ๋ฒ•

1. ์ค‘์•™ ์ €์žฅ์†Œ์˜ ์ž๋ฃŒ๋ฅผ pull (๋ฐ˜๋“œ์‹œ push์ „์— pull ๋จผ์ € ํ•ด์•ผํ•จ)
	- git pull upstream main
2. ๋กœ์ปฌ ์ €์žฅ์†Œ์—์„œ staging ์˜์—ญ์— commitํ•  ํŒŒ์ผ ์˜ฌ๋ฆฌ๊ธฐ
	- git add . (์ž‘์—…ํ•œ ํŒŒ์ผ ์ „์ฒด ์˜ฌ๋ผ๊ฐ)
3. commit
	- git commit -m "์“ธ๋ง"
4. ์›๊ฒฉ ์ €์žฅ์†Œ์— push
	- git push origin main

Merge ๋ฐฉ๋ฒ•

1. forkํ•œ ์›๊ฒฉ ์ €์žฅ์†Œ์— ๋“ค์–ด๊ฐ€์„œ Pull request ํด๋ฆญ
2. new pull request ํด๋ฆญ
3. ์›๊ฒฉ ์ €์žฅ์†Œ์—์„œ ์ค‘์•™ ์ €์žฅ์†Œ์˜ main์œผ๋กœ ๋ณด๋‚ด๋Š”์ง€ ํ™•์ธํ•˜๊ณ  merge
	- pull์„ ๋จผ์ € ํ•˜์ง€ ์•Š์•„ ์ค‘์•™์ €์žฅ์†Œ์™€ ์›๊ฒฉ์ €์žฅ์†Œ์˜ ํŒŒ์ผ์ด ๋งž์ง€ ์•Š์œผ๋ฉด ๋จธ์ง€ ๋ถˆ๊ฐ€

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

 
 
 

Contributors

Languages