1
0
Fork 0

[Docs] Update check commands in Japanese documents (#7787)

The Japanese documents included a sample command to check the original document changes. But there was something wrong, so I fixed it.
This commit is contained in:
Takeshi ISHII 2020-01-06 16:43:11 +09:00 committed by James Young
parent f2c61f8840
commit b3b115bcc4
23 changed files with 29 additions and 29 deletions

View file

@ -3,7 +3,7 @@
<!---
grep --no-filename "^[ ]*git diff" docs/ja/*.md | sh
original document: adf4acf59:docs/newbs_git_resolving_merge_conflicts.md
git diff adf4acf59 HEAD docs/newbs_git_resolving_merge_conflicts.md | cat
git diff adf4acf59 HEAD -- docs/newbs_git_resolving_merge_conflicts.md | cat
-->
ブランチでの作業の完了に時間がかかる場合、他の人が行った変更が、プルリクエストを開いたときにブランチに加えた変更と競合することがあります。