Update Japanese materials #355

dzeyelid · 2022-03-18T13:07:10Z

I updated Japanese docs along with current English docs.
Please review them.

I also some changes to English docs to improve them.

Because in this section Project 4 the project was created by `git init` so the default branch is `master`, not `main`.

- Update "getting ready for Class" page - Fix code blocks - Fix displaying icons - Update an example of the issue description

ppremk · 2022-03-21T10:53:11Z

@dzeyelid 👋🏽 are you able to paste the local test run screen capture and results in here please. This will help us to keep audit that this PR when merge works as expected and does not break the manual in general. 🙇🏽

junkofujiwara · 2022-03-21T10:54:35Z

verified the translation.

ppremk · 2022-03-21T10:54:51Z

Translation verified by @junkofujiwara. Good to merge when all test have passed.

dzeyelid · 2022-03-21T13:21:15Z

@junkofujiwara Thank you for verifying!
@ppremk I fixed all linter errors, including some that I did not change but were shown as errors by the linter. Please confirm it 🙏

parkerbxyz

Wow, thank you so much for these contributions, @dzeyelid! ✨ I left just a few minor suggestions. Once those are incorporated, I think this will be good to go. 😊

docs/02a_activity_create_github_issue.md

parkerbxyz · 2022-03-21T18:39:45Z

docs/12b_resolving_merge_conflicts.md

+   1. Working locally, switch to `main` branch and pull updates from remote.
+
+   ```sh
+   git switch main
+   git pull
+   ```
+
+   1. Fetch the `USERNAME-modify-conflict` branch from remote and switch to the same branch locally.
+
+   ```sh
+   git fetch
+   git switch USER-modify-conflict
+   ```
+
+   1. Merge `main` into the feature branch.
+
+   ```sh
+   git merge main
+   ```
+
+   1. When you see there's a conflict, that's OK! The files that have conflicts are listed under `Unmerged Paths`. Type `git status` to verify which file has the conflict.
+
+   ```sh
+   git status
+   ```
+
+   1. Open that file in your text editor, and look for the merge conflict markers. (`<<<<<<<`, `=======`, `>>>>>>>`)
+
+   ```sh
+   # Open the file on Visual Studio Code
+   code _slides/##-USERNAME.md
+   ```
+
+   1. Both branches' versions of code are present - pick which one you want to keep, and save the changes.
+   1. Add and commit the saved changes to resolve the merge conflict.
+
+   ```sh
+   git add _slides/##-USERNAME.md
+   git commit
+   ```
+
+   1. Push the feature branch up to the remote, and see the resolution in the pull request.
+
+   ```sh
+   git push
+   ```
+


Could you please indent each of the fenced code blocks an additional 3 spaces so they will be inline with the list items they correspond to?

Example

Before

When you see the merge conflict in the second pull request titled USERNAME resolve conflict, work by yourself to resolve the merge conflict.

Working locally, switch to main branch and pull updates from remote.

git switch main git pull

Fetch the USERNAME-modify-conflict branch from remote and switch to the same branch locally.

git fetch git switch USER-modify-conflict

After

When you see the merge conflict in the second pull request titled USERNAME resolve conflict, work by yourself to resolve the merge conflict.

Working locally, switch to main branch and pull updates from remote.

git switch main git pull

Fetch the USERNAME-modify-conflict branch from remote and switch to the same branch locally.

git fetch git switch USER-modify-conflict

^{Reference: https://www.markdownguide.org/basic-syntax/#adding-elements-in-lists}

Thanks for the advice!

parkerbxyz · 2022-03-21T18:43:40Z

docs/01_getting_ready_for_class.md

+code .
+```
+
 _**Note:** If you are working on a Mac, you will need to Install Shell Commands from the Atom menu, this happens as part of the installation process for Windows._


Let’s move this note up so it’s just below the atom . command.

docs/17_protected_branches.md

docs/22_merge_strategies_rebase.md

parkerbxyz · 2022-03-21T18:49:12Z

docs/ja/12b_resolving_merge_conflicts.md

+1. `USERNAME resolve conflict` の Pull Request でマージコンフリクトが発生していることを確認し、マージコンフリクトを解消しましょう。
+   1. ローカル環境で、下記の操作を行い、 `main` ブランチの更新取込みを行います。
+
+   ```sh
+   git switch main
+   git pull
+   ```
+
+   1. `git fetch` でリモート（ GitHub 上）の情報を取込み、リモートで作成した `USERNAME-modify-conflict` ブランチをアップストリームに設定した上で、ローカルのブランチを切り替えます。
+
+   ```sh
+   git fetch
+   git switch USER-modify-conflict
+   ```
+
+   1. `main` ブランチをフィーチャーブランチにマージします。
+
+   ```sh
+   git merge main
+   ```
+
+   1. マージコンフリクトが発生しても大丈夫！コンフリクトがあるファイルは `Unmerged Paths` に表示されます。 `git status` を実行して、どのファイルにコンフリクトがあるかを確認します。
+
+   ```sh
+   git status
+   ```
+
+   1. そのファイルをテキストエディタで開き、マージコンフリクトのマーカーを探します。 (`<<<<<<<`, `=======`, `>>>>>>>`)
+
+   ```sh
+   # Visual Studio Code で開く場合
+   code _slides/##-USERNAME.md
+   ```
+
+   1. マーカーに囲まれた両ブランチのコードのうち、残したい方を残し、変更を保存します。
+   1. マージコンフリクトを解決するために、保存した変更をステージに追加しコミットします。
+
+   ```sh
+   git add _slides/##-USERNAME.md
+   git commit
+   ```
+
+   1. そのフィーチャーブランチをリモートにプッシュします。
+
+   ```sh
+   git push
+   ```
+


Let’s fix the indentation of the fenced code blocks here too.

Co-authored-by: Parker Brown <[email protected]>

dzeyelid · 2022-03-23T10:03:18Z

@parkerbxyz Thanks for your review! I applied your feedback. Please confirm it. 🙏

parkerbxyz

These changes look great. Thanks again, @dzeyelid! 💖

dzeyelid added 10 commits March 17, 2022 08:21

Update the filename to fit current instructions

e00719b

Revert the default branch name from main to master

16aece3

Because in this section Project 4 the project was created by `git init` so the default branch is `master`, not `main`.

Update contents under /docs/ja

7cf380a

Update contents(en) under /docs

dba4af9

Update contents both of en and ja

00d3b6b

- Update "getting ready for Class" page - Fix code blocks - Fix displaying icons - Update an example of the issue description

Add steps to practice alone on 12b_resolving_merge_conflicts.md

55ed055

Improve the title of docs\ja\17_protected_branches.md

4b7c9a5

Update docs

26ad441

Update docs

1c492ce

Remove an unlinked doc

c4c16b4

dzeyelid requested a review from a team as a code owner March 18, 2022 13:07

dzeyelid added 2 commits March 21, 2022 12:48

Fix linter errors

f7d1cab

Fix linter errors

ae13d6d

parkerbxyz requested changes Mar 21, 2022

View reviewed changes

dzeyelid and others added 4 commits March 23, 2022 18:51

Update docs/02a_activity_create_github_issue.md

d4e7cbe

Co-authored-by: Parker Brown <[email protected]>

Update docs/17_protected_branches.md

79d65ab

Co-authored-by: Parker Brown <[email protected]>

Update docs/22_merge_strategies_rebase.md

596fa82

Co-authored-by: Parker Brown <[email protected]>

Apply feedback

9c420c1

parkerbxyz approved these changes Mar 24, 2022

View reviewed changes

parkerbxyz merged commit 8ac62b5 into githubtraining:main Mar 24, 2022

ppremk deleted the update-materials branch March 24, 2022 10:49

Update Japanese materials #355

Update Japanese materials #355

Uh oh!

Conversation

dzeyelid commented Mar 18, 2022

Uh oh!

ppremk commented Mar 21, 2022

Uh oh!

junkofujiwara commented Mar 21, 2022

Uh oh!

ppremk commented Mar 21, 2022

Uh oh!

dzeyelid commented Mar 21, 2022

Uh oh!

parkerbxyz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

parkerbxyz Mar 21, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Example

Before

After

Uh oh!

dzeyelid Mar 23, 2022

Choose a reason for hiding this comment

Uh oh!

parkerbxyz Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

parkerbxyz Mar 21, 2022

Choose a reason for hiding this comment

Uh oh!

dzeyelid commented Mar 23, 2022

Uh oh!

parkerbxyz left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

parkerbxyz Mar 21, 2022 •

edited

Loading