search

sirin05137 / CSE364_Project

2 stars 0 forks source link

check genre input validity added #15

Closed sanghun17 closed 3 years ago

sanghun17 commented 3 years ago

check genre input validity added

yuujinleee commented 3 years ago

3/31 Final Merge day πŸŽ‰

ν”ŒλŸ¬κ·ΈμΈ κ΄€λ ¨ μ„ΈνŒ…μ΄ 많이 λ”Έλ €λ“€μ–΄μ™€μ„œ Changed Files κ°€ 62개인데, ν”ŒλŸ¬κ·ΈμΈ μ œμ™Έν•˜κ³  보면

filename Merge? note
README.md X yujin_javafix λΈŒλžœμΉ˜μ— μƒν›ˆ μˆ˜μ •μ‚¬ν•­ ν¬ν•¨ν•΄μ„œ README μ—…λ°μ΄νŠΈ ν•΄λ†“μŒ #18
src/main/java/group11/project.java O? μƒν›ˆ μˆ˜μ •μ‚¬ν•­μ΄ yujin_javafix에 아직 λ°˜μ˜λ˜μ§€ μ•ŠμŒ (JUnit ν…ŒμŠ€νŠΈ 이슈). 근데 λ‚΄ μ½”λ“œ μˆ˜μ •μ‚¬ν•­μ€ λ°˜μ˜λ˜μ–΄ 있음.

κ²°λ‘ 

cherrypick둜 sanghun17 λΈŒλžœμΉ˜μ—μ„œ 파일 κ³¨λΌμ„œ master에 Merge ν•˜λŠ” 것보닀

yujin_javafix->master λ¨Όμ € merge μ‹œν‚€κ³ 

sanghun17 브랜치 project.java μˆ˜μ • 사항 μœ„μ£Όλ‘œ merge 없이 master 직접 μˆ˜μ •μ΄ λ‚˜μ„ λ“―?