drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

The TAGs of the original document has been updated to facilitate future verification. (#9285)

Browse source
This commit is contained in:
Takeshi ISHII 2020-06-05 21:49:34 +09:00 • committed by GitHub
parent b327d20402
commit 3972978c8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/ja/newbs_git_resolving_merge_conflicts.md
View file

@ -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
-->
ブランチでの作業の完了に時間がかかる場合、他の人が行った変更が、プルリクエストを開いたときにブランチに加えた変更と競合することがあります。