Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

{이름_2}.md 생성하고, {이름}.md 수정하기 #6

Open
Cha-Ji opened this issue Mar 31, 2022 · 0 comments
Open

{이름_2}.md 생성하고, {이름}.md 수정하기 #6

Cha-Ji opened this issue Mar 31, 2022 · 0 comments
Labels
1차 2차 세미나 목표 2차 사전준비 3차 세미나를 듣기 전에 해야될 일
Milestone
1차

Comments

@Cha-Ji
Copy link
Member

Cha-Ji commented Mar 31, 2022 •
edited
Loading

  • develop에서 feature/#6 branch를 만든다.

  • {이름.md}를 수정한 commit과 {이름_2.md}를 추가한 commit을 날린다.

  • 두 branch를 모두 pr 보내고, 충돌을 확인한다.

  • merge는 시키지 마세요~
@Cha-Ji Cha-Ji added 1차 2차 세미나 목표 2차 사전준비 3차 세미나를 듣기 전에 해야될 일 labels Mar 31, 2022
@Cha-Ji Cha-Ji added this to the 1차 milestone Apr 1, 2022
dohun31 added a commit to dohun31/Git-codelab that referenced this issue Apr 5, 2022
@dohun31
Issue GDSC-PKNU-Official#6 edit: dohun.md 수정(GDSC-PKNU-Official#6)
a5f0c65
dohun31 added a commit to dohun31/Git-codelab that referenced this issue Apr 5, 2022
@dohun31
Issue GDSC-PKNU-Official#6 feat: dohun_2.md 추가(GDSC-PKNU-Official#6)
4774320
Cha-Ji added a commit to Cha-Ji/Git-codelab that referenced this issue Apr 5, 2022
@Cha-Ji
Issue GDSC-PKNU-Official#6 fix: modify chaji.md
6298f20
Cha-Ji added a commit to Cha-Ji/Git-codelab that referenced this issue Apr 5, 2022
@Cha-Ji
Issue GDSC-PKNU-Official#6 feat: add chaji_2.md
4dbfcd0
@Cha-Ji Cha-Ji mentioned this issue Apr 5, 2022
Closed
@dohun31 dohun31 mentioned this issue Apr 5, 2022
Closed
coke98 added a commit to coke98/Git-codelab that referenced this issue Apr 5, 2022
@coke98
Issue GDSC-PKNU-Official#6 fix: Hyeonseok.md 수정
c26d47b
coke98 added a commit to coke98/Git-codelab that referenced this issue Apr 5, 2022
@coke98
Issue GDSC-PKNU-Official#6 feat: Hyeonseok_2.md 추가
35d26b3
JeongHunMoon pushed a commit to JeongHunMoon/Git-codelab that referenced this issue Apr 5, 2022
Feat:GDSC-PKNU-Official#6
b689f1d
@coke98 coke98 mentioned this issue Apr 5, 2022
Closed
@JeongHunMoon JeongHunMoon mentioned this issue Apr 5, 2022
Closed
Cha-Ji added a commit to Cha-Ji/Git-codelab that referenced this issue Apr 10, 2022
@Cha-Ji
Issue GDSC-PKNU-Official#6 test: 중복 생성 충돌 실험
77d8ef4
Cha-Ji added a commit that referenced this issue Apr 10, 2022
@Cha-Ji
Merge pull request #25 from Cha-Ji/feature/#6_conflict
ede4929 
Issue #6 test: 중복 생성 충돌 실험
Cha-Ji added a commit to Cha-Ji/Git-codelab that referenced this issue Apr 10, 2022
@Cha-Ji
Issue GDSC-PKNU-Official#6 test: 중복 생성 충돌 완료
a5031ba
Cha-Ji added a commit that referenced this issue Apr 10, 2022
@Cha-Ji
Merge pull request #26 from Cha-Ji/feature/#6_conflict
326a2b2 
Issue #6 test: 중복 생성 충돌 완료
Cha-Ji added a commit to Cha-Ji/Git-codelab that referenced this issue Apr 10, 2022
@Cha-Ji
Issue GDSC-PKNU-Official#6 fix: 고의 충돌
df9d457
Cha-Ji added a commit to Cha-Ji/Git-codelab that referenced this issue Apr 10, 2022
@Cha-Ji
Issue GDSC-PKNU-Official#6 fix: 고의 충돌
36a7e76
Yoon6 added a commit to Yoon6/Git-codelab that referenced this issue Apr 12, 2022
@Yoon6
Issue GDSC-PKNU-Official#6 feat:DaeyoonChoi_2.md
e3aee75
Cha-Ji added a commit that referenced this issue Apr 12, 2022
@Cha-Ji
Issue #6 fix: 고의 충돌
b757aeb
dmswjdchl added a commit to dmswjdchl/Git-codelab that referenced this issue Apr 12, 2022
@dmswjdchl
Issue GDSC-PKNU-Official#6 feature: README.md 수정
5af0362
Cha-Ji added a commit to Cha-Ji/Git-codelab that referenced this issue Apr 12, 2022
@Cha-Ji
Issue GDSC-PKNU-Official#6 fix: 고의 충돌
e7eb1cc
Cha-Ji added a commit to Cha-Ji/Git-codelab that referenced this issue Apr 12, 2022
@Cha-Ji
Issue GDSC-PKNU-Official#6 feat: add chaji_2.md
0e88dbb
@Cha-Ji Cha-Ji mentioned this issue Apr 12, 2022
Merged
@coke98 coke98 mentioned this issue Apr 12, 2022
Closed
dohun31 added a commit to dohun31/Git-codelab that referenced this issue Apr 12, 2022
@dohun31
Issue GDSC-PKNU-Official#6 edit: dohun.md 수정(GDSC-PKNU-Official#6)
a444084
coke98 added a commit to coke98/Git-codelab that referenced this issue Apr 12, 2022
@coke98
Issue GDSC-PKNU-Official#6 feat: Hyeonseok_2.md 추가
3ea00ad
@coke98 coke98 mentioned this issue Apr 12, 2022
Merged
dmswjdchl added a commit to dmswjdchl/Git-codelab that referenced this issue Apr 12, 2022
@dmswjdchl
Issue GDSC-PKNU-Official#6 feat: CJE.md 수정, CJE_2.md 추가
2f4ec37
Cha-Ji added a commit that referenced this issue Apr 12, 2022
@Cha-Ji
Merge pull request #31 from Cha-Ji/feature/#6_cherry
64318e4 
Issue #6 feat: add chaji_2.md
Cha-Ji added a commit that referenced this issue Apr 12, 2022
@Cha-Ji
Merge pull request #35 from dohun31/feature/#6_cherry
039112c 
Issue #6 edit: dohun.md 수정(#6)
Cha-Ji added a commit that referenced this issue Apr 12, 2022
@Cha-Ji
Merge pull request #36 from coke98/feature/#6_cherry
7803da7 
Issue #6 feat: Hyeonseok_2.md 추가
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
1차 2차 세미나 목표 2차 사전준비 3차 세미나를 듣기 전에 해야될 일
Projects
None yet
Milestone
1차
Development

No branches or pull requests
1 participant
@Cha-Ji