aboutsummaryrefslogtreecommitdiffstats
path: root/docs/ja/newbs_git_resolving_merge_conflicts.md
AgeCommit message (Collapse)Author
2020-06-05The TAGs of the original document has been updated to facilitate future ↵Gravatar Takeshi ISHII
verification. (#9285)
2020-01-05[Docs] Update check commands in Japanese documents (#7787)Gravatar Takeshi ISHII
The Japanese documents included a sample command to check the original document changes. But there was something wrong, so I fixed it.
2019-12-28Japanese translation of docs/newbs_git_*.md (#7689)Gravatar Takeshi ISHII
* 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>