Skip to content

fix korean 하였 to 했 #45

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

Merged
pismute merged 1 commit into from
Jul 26, 2015
Merged

fix korean 하였 to 했 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion book/03-git-branching/sections/basic-branching-and-merging.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ After you've resolved each of these sections in each conflicted file, run `git a
Staging the file marks it as resolved in Git.
//////////////////////////
충돌한 양쪽에서 조금씩 가져와서 새로 수정했다.
그리고 `<<<<<<<`, `=======`, `>>>>>>>`가 포함된 행을 삭제하였다.
그리고 `<<<<<<<`, `=======`, `>>>>>>>`가 포함된 행을 삭제했다.
이렇게 충돌한 부분을 해결하고 `git add` 명령으로 다시 Git에 저장한다.

//////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion book/06-github/sections/3-maintaining.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ image::images/collaborators.png[저장소의 동료.]
//////////////////////////
Now that you have a project with some code in it and maybe even a few collaborators who also have push access, let's go over what to do when you get a Pull Request yourself.
//////////////////////////
프로젝트를 만들고 코드도 넣고 동료가 Push 할 수 있게 하였다. 이제 Pull Reqeust가 왔을 때 어떻게 해야 하는지 보자.
프로젝트를 만들고 코드도 넣고 동료가 Push 할 수 있게 했다. 이제 Pull Reqeust가 왔을 때 어떻게 해야 하는지 보자.

//////////////////////////
Pull Requests can either come from a branch in a fork of your repository or they can come from another branch in the same repository. The only difference is that the ones in a fork are often from people where you can't push to their branch and they can't push to yours, whereas with internal Pull Requests generally both parties can access the branch.
Expand Down
2 changes: 1 addition & 1 deletion book/B-embedding-git/sections/jgit.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ The plumbing APIs are rather complete, but it can be cumbersome to string them t
JGit provides a higher-level set of APIs to help out with this, and the entry point to these APIs is the `Git` class:
//////////////////////////
Plumbing API로도 모든 일을 다 할 수 있지만, 일반적인 상황에 사용하기에는 좀 귀찮다. Index에 파일을 추가하거나 새로 커밋하는 것 같은 일은 Porcelain API가 낫다.
Porcelain API는 고수준에서 사용하기 편하게 하였고 `Git` 클래스의 인스턴스를 만드는 것으로 시작한다.
Porcelain API는 고수준에서 사용하기 편하게 했고 `Git` 클래스의 인스턴스를 만드는 것으로 시작한다.

[source,java]
----
Expand Down