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.

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

Add my impression #22

Open
wants to merge 4 commits into
base: gh-pages
Choose a base branch
from
Open

Add my impression #22

wants to merge 4 commits into from

Conversation

SANGHUN-JOO
Copy link

it is practice of pull request!:)

<p class="impression">Git과 Github 입문서로 강력 추천! (@kyjelblue)</p>
<p class="impression">Github 사용의 기본을 단단하게 다져주는 책입니다. (@chszard)</p>
<p class="impression">항상 재미있게 읽고 있어요!(@hasat)</p>
<p class="impression">Git &amp; GitHub과 친해질 기회가 되었어요!(@mastojun)</p>
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

으엉... 이런거 올리시면 안됩니다 ;ㅂ;)..

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

안녕하세요.

실례지만 누구신지 궁금합니다.
또한 이런거 올리시면 안되신다고 메일 주셨는데
이런게 어떤것인지 궁금하여 이렇게 메일을 남깁니다.

감사합니다.

주 상훈 올림.
-----Original Message-----
From: "Youngjun Song"<[email protected]>
To: "jpub-gh/first-pr"<[email protected]>;
Cc: "SANGHOON JOO"<[email protected]>;
Sent: 2015-10-20 (화) 11:03:51
Subject: Re: [first-pr] Add my impression (#22)

In index.html:

> <p class="impression">Git과 Github 입문서로 강력 추천! (@kyjelblue)</p>
> <p class="impression">Github 사용의 기본을 단단하게 다져주는 책입니다. (@chszard)</p>
> <p class="impression">항상 재미있게 읽고 있어요!(@hasat)</p>
> - <p class="impression">Git &amp; GitHub과 친해질 기회가 되었어요!(@mastojun)</p>
> +<<<<<<< HEAD

으엉... 이런거 올리시면 안됩니다 ;ㅂ;)..


Reply to this email directly or view it on GitHub.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아.. 메일로 가서 정확히 못보셨나봅니다 ^^;
#22 에 답글을 단 것 입니다.
쌓여있는 Pull Request를 처리하던중에, 상훈님께서 보내신 Pull Request를 발견했고,
merge conflict 발생된게 해결되지 않은채 올려주셔서요.

작성하신 work 브랜치에서 Merge conflict 을 수정후 다시 올려보세요 : )

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants