aboutsummaryrefslogtreecommitdiffstats
path: root/docs/ja/newbs_git_resolving_merge_conflicts.md
Commit message (Collapse)AuthorAgeFilesLines
* The TAGs of the original document has been updated to facilitate future ↵Takeshi ISHII2020-06-051-2/+2
| | | | verification. (#9285)
* [Docs] Update check commands in Japanese documents (#7787)Takeshi ISHII2020-01-051-1/+1
| | | The Japanese documents included a sample command to check the original document changes. But there was something wrong, so I fixed it.
* Japanese translation of docs/newbs_git_*.md (#7689)Takeshi ISHII2019-12-281-0/+94
* update docs/ja/newbs.md * update docs/ja/_summary.md * Translate docs/newbs_git_best_practices.md into Japanese. * Translate docs/newbs_git_using_your_master_branch.md into Japanese. * Translate docs/newbs_git_resolving_merge_conflicts.md into Japanese. * Translate docs/newbs_git_resynchronize_a_branch.md into Japanese. * Update docs/ja/newbs_git_using_your_master_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * update ja/newbs_git_resynchronize_a_branch.md * update ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_best_practices.md * Update docs/ja/_summary.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * update ja/newbs_git_resynchronize_a_branch.md * update ja/newbs_learn_more_resources.md * Update docs/ja/newbs_git_resynchronize_a_branch.md * Update docs/ja/newbs_git_resynchronize_a_branch.md Co-Authored-By: shela <shelaf@users.noreply.github.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 05:54:45 +0000