9th Translation 1133 Words #82
Merged
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
| If you're programming on Windows and working with people who are not (or vice-versa), you'll probably run into line-ending issues at some point. | ||
| This is because Windows uses both a carriage-return character and a linefeed character for newlines in its files, whereas Mac and Linux systems use only the linefeed character. | ||
| This is a subtle but incredibly annoying fact of cross-platform work; many editors on Windows silently replace existing LF-style line endings with CRLF, or insert both line-ending characters when the user hits the enter key. | ||
| Kung ikaw ay nagpo-program sa Windows at nakipagtrabaho sa mga taong hindi gumagamit nito ( o kabaligtaran), malamang madadaanan mo ang patapos na linyang isyu sa isang punto. |
| This is because Windows uses both a carriage-return character and a linefeed character for newlines in its files, whereas Mac and Linux systems use only the linefeed character. | ||
| This is a subtle but incredibly annoying fact of cross-platform work; many editors on Windows silently replace existing LF-style line endings with CRLF, or insert both line-ending characters when the user hits the enter key. | ||
| Kung ikaw ay nagpo-program sa Windows at nakipagtrabaho sa mga taong hindi gumagamit nito ( o kabaligtaran), malamang madadaanan mo ang patapos na linyang isyu sa isang punto. | ||
| Ito ay dahil ginagamit ng Windows ang parehong titik na pag-carriage-return at isang titik ng linefeed para sa mga bagong linya sa mga file nito, samantalang ginagamit lamang ng Mac at Linux sistema ang titik na linefeed. |
|
|
||
| If you want to try this out, P4Merge works on all major platforms, so you should be able to do so. | ||
| We'll use path names in the examples that work on Mac and Linux systems; for Windows, you'll have to change `/usr/local/bin` to an executable path in your environment. | ||
| Maari kang mag-set-up ng isang graphical na merge-conflict-resolution na kasangkapan imbes na mano-manong pagresolba sa mga pagkasalungat. |
| Next, you'll set up external wrapper scripts to run your commands. | ||
| We'll use the Mac path for the executable; in other systems, it will be where your `p4merge` binary is installed. | ||
| Set up a merge wrapper script named `extMerge` that calls your binary with all the arguments provided: | ||
| Ipapakita namin ang pag-set-up ng Perforce Visual Merge na Kasangkapan (P4Merge) upang gawin ang iyong mga diff at pagsasama na mga panukala, dahil ito ay mahusay na grapikong kasangkapan at it ay libre. |
| Kung gusto mong subukan ito, ang P4Merge ay gumagana sa lahat ng pangunahing mga plataporma, kaya dapat lang na magawa mo ito. | ||
| Gagamit kami ng mga pangalan ng path sa mga halimbawa na gumagana sa Mac at Linux na mga sistema; para sa Windows, kailangan mong palitan ang `/usr/local/bin` sa isang nagpapatupad na path sa iyong kapaligiran ng paggawa. | ||
|
|
||
| Para simulan, https://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools[i-download ang P4Merge galing Perforce]. |
|
|
||
| [source,console] | ||
| ---- | ||
| $ git diff 32d1776b1^ 32d1776b1 | ||
| ---- | ||
|
|
||
| Instead of getting the diff output on the command line, Git fires up P4Merge, which looks something like this: | ||
| Imbes na makukuha mo ang diff na output sa linya ng utos, ang Git ay magpapatakbo ng P4Merge, na ang hitsura ay parang ganito: |
|
|
||
| Git comes preset to use a number of other merge-resolution tools without your having to set up the cmd configuration. | ||
| To see a list of the tools it supports, try this: | ||
| Ang Git ay may preset para gamitin ang iba't-ibang mga kasangkapan ng resolusyong pagsasama na hindi na kailangang i-set-up ang cmd na kompigurasyon. |
|
|
||
| [source,console] | ||
| ---- | ||
| $ git config --global merge.tool kdiff3 | ||
| ---- | ||
|
|
||
| If you run this instead of setting up the `extMerge` and `extDiff` files, Git will use KDiff3 for merge resolution and the normal Git diff tool for diffs. | ||
| Kung patatakbuhin mo ito imbes sa pag-set-up ng `extMerge` at `extDiff` na mga file, ang Git ay gagamit ng KDiff3 para sa resolusyon ng pagsasama at ang normal na Git diff na kasangkapan para sa mga diff. |
| Formatting and whitespace issues are some of the more frustrating and subtle problems that many developers encounter when collaborating, especially cross-platform. | ||
| It's very easy for patches or other collaborated work to introduce subtle whitespace changes because editors silently introduce them, and if your files ever touch a Windows system, their line endings might be replaced. | ||
| Git has a few configuration options to help with these issues. | ||
| Pag-format at whitespace ng mga isyu ay ilan sa mga mas nakakabigo at banayad na mga problema na maraming mga developers ay nakatagpo kapag nakikipagtulungan, lalo na ang cross-platform. |
| It's very easy for patches or other collaborated work to introduce subtle whitespace changes because editors silently introduce them, and if your files ever touch a Windows system, their line endings might be replaced. | ||
| Git has a few configuration options to help with these issues. | ||
| Pag-format at whitespace ng mga isyu ay ilan sa mga mas nakakabigo at banayad na mga problema na maraming mga developers ay nakatagpo kapag nakikipagtulungan, lalo na ang cross-platform. | ||
| Napakadali para sa mga patch o iba pang mga nakipagtulungan sa trabaho upang ipakilala ang mga banayad na mga pagbabago sa whitespace dahil ang mga editor ay tahimik na ipinakilala ang mga ito, at kung ang iyong mga file ay nagalaw ng isang Windows na sistema, ang kanilang mga katapusan ng linya ay maaaring napalitan. |
There was a problem hiding this comment.
o iba pang pinagtutulungang trabaho
|
I just updated the changes suggested from my pr. 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.
Hi everyone,
Please, take some time again to review my PR. Thanks!