Translate 07-git-tools submodules v2 #171
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
networm
changed the title
| It often happens that while working on one project, you need to use another project from within it. | ||
| Perhaps it’s a library that a third party developed or that you’re developing separately and using in multiple parent projects. | ||
| A common issue arises in these scenarios: you want to be able to treat the two projects as separate yet still be able to use one from within the other. | ||
| 经常有一种情况是你在一个项目中工作，需要将另一个项目包含在其中使用它。 |
There was a problem hiding this comment.
有一种经常会遇到的情况：你工作中的项目需要包含并使用另一个项目
| @@ -573,7 +573,7 @@ Recorded preimage for 'src/main.c' | |||
| Automatic merge failed; fix conflicts and then commit the result. | |||
| ---- | |||
|
|
|||
| We got an actual merge conflict here, so if we resolve that and commit it, then we can simply update the main project with the result. | |||
| 我们在这儿得到了一个实际的合并冲突，所以如果我们解决并提交它，那么可以简单地通过结果来更新主项目。 | |||
There was a problem hiding this comment.
我们在这儿得到了一个真正的合并冲突，所以如果想要解决并提交它，那么只需简单地通过结果来更新主项目。
|
@OlingCat 已修正。 |
networm
added a commit
that referenced
this pull request
Aug 14, 2015
Translate 07-git-tools submodules
|
@IceNature @Geno1024 @OlingCat @jiayouxjh 已合并入主干。 |
OlingCat
pushed a commit
to OlingCat/progit2-zh
that referenced
this pull request
Mar 6, 2020
Some more fixes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.