TL Localization - Chapter 7, Submodules (1,448 words) #88
Conversation
This file contains 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
cherryloua
reviewed
Mar 7, 2018
There was a problem hiding this comment.
Hi @heywens
I have a few suggestions that you may like to consider.
| If you run `git diff` you can get the SHA-1s of the commits recorded in both branches you were trying to merge. | ||
| Upang malutas ang problema, kailangan mong alamin kung ano ang dapat na estado ng submodule. | ||
| Kakaiba, hindi masyadong nagbibigay ang Git sa iyo ng impormasyon na tutulong dito, kahit na ang SHA-1s ng mga commit sa parehong panig ng kasaysayan. | ||
| Sa kabutihang-palad, madali ito alamin. |
There was a problem hiding this comment.
"madali ito alamin" to madali itong alamin
| This is what you'll have to merge in and resolve. | ||
| You can either just try the merge with the SHA-1 directly, or you can create a branch for it and then try to merge that in. | ||
| We would suggest the latter, even if only to make a nicer merge commit message. | ||
| Ang mahalaga ay ang SHA-1 ng commiut mula sa ibang bahagi. |
|
|
||
| So, we will go into our submodule directory, create a branch based on that second SHA-1 from `git diff` and manually merge. | ||
| Kaya, pupunta tayo sa ating submodule na direktoryo, lumikha ng isang branch batay sa pangalawang SHA-1 na iyon mula sa `git diff` and mano-manong i-merge. | ||
|
|
There was a problem hiding this comment.
"and mano-manong" to "at mano-manong"
|
|
||
| There are a few things you can do to make working with submodules a little easier. | ||
| ay ilang mga bagay na maaaring mong gawin upang gawing mas madali ang pagtatrabaho sa mga aubmodule. | ||
|
|
| Ito ay talagang makakatulong kung mayroon kang iilang mga submodule sa parehong proyekto. | ||
|
|
||
| Halimbawa, sabihin natin na nais nating magsimula ng isang bagong tampok o gumawa ng isang bugfix at mayroon tayong ginagawang trabaho sa iilang mga submodule. | ||
| Madali nating mai-stash ang lahat ng trabaho sa lahat ng atong mga submodule. |
There was a problem hiding this comment.
"lahat ng atong" to "lahat ng ating"
| ---- | ||
|
|
||
| You can force it to switch with `checkout -f`, but be careful that you don't have unsaved changes in there as they could be overwritten with that command. | ||
| Maaari mong pilitan na palitan ito gamit ang `checkout -f`, ngunit mag-ingat na wala kang hindi naka-save ng mga pagbabago doon dahil ang mga iyon ay masasapawan ng utos na ito. |
There was a problem hiding this comment.
"pilitan na palitan ito gamit ang" to "pilitan ito gamit ang"
|
Hi @cherryloua, thank you for taking time on reviewing my contribution. Thanks! |
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.
Completed translation for submodules