diff options
| author |  Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2020-06-05 21:49:34 +0900 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-06-05 21:49:34 +0900 |
| commit | 3972978c8d21dbd9619a8bc708a361858286e9ef (patch) | |
| tree | 5ad2b4e48eaa2aabefac11e3ae2a2779b0ca56a4 /docs/ja/newbs_git_resolving_merge_conflicts.md | |
| parent | b327d2040245ba50e8b3560e6a15df659aa51760 (diff) | |
| download | qmk_firmware-3972978c8d21dbd9619a8bc708a361858286e9ef.tar.gz | |
The TAGs of the original document has been updated to facilitate future verification. (#9285)
Diffstat (limited to 'docs/ja/newbs_git_resolving_merge_conflicts.md')
| -rw-r--r-- | docs/ja/newbs_git_resolving_merge_conflicts.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/ja/newbs_git_resolving_merge_conflicts.md b/docs/ja/newbs_git_resolving_merge_conflicts.md index 893c3d503..532b1e300 100644 --- a/docs/ja/newbs_git_resolving_merge_conflicts.md +++ b/docs/ja/newbs_git_resolving_merge_conflicts.md @@ -2,8 +2,8 @@ <!--- 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 + original document: 0.9.0:docs/newbs_git_resolving_merge_conflicts.md + git diff 0.9.0 HEAD -- docs/newbs_git_resolving_merge_conflicts.md | cat --> ブランチでの作業の完了に時間がかかる場合、他の人が行った変更が、プルリクエストを開いたときにブランチに加えた変更と競合することがあります。 |