gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(i18n,docs): processed translations (#43758)

Browse Source
This commit is contained in:
camperbot
2021-10-07 05:37:51 -07:00
committed by GitHub
parent 25783b7929
commit f069173edb
46 changed files with 372 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
docs/i18n/chinese/how-to-open-a-pull-request.md
View File

@@ -132,37 +132,37 @@ When you are working on features for our upcoming curriculum `next-*` branches,
a. Either delete your local branch after taking a backup (if you still have it locally):
```console
git checkout <pr-branch-name>
```console
git checkout <pr-branch-name>
# example:
# git checkout feat/add-numpy-video-question
# example:
# git checkout feat/add-numpy-video-question
git checkout -b <backup-branch-name>
git checkout -b <backup-branch-name>
# example:
# git checkout -b backup-feat/add-numpy-video-question
# example:
# git checkout -b backup-feat/add-numpy-video-question
git branch -D <pr-branch-name>
```
git branch -D <pr-branch-name>
```
b. Or just a backup of your pr branch (if you do not have it locally):
```console
git checkout -b <backup-branch-name> origin/<pr-branch-name>
```console
git checkout -b <backup-branch-name> origin/<pr-branch-name>
# example:
# git checkout -b backup-feat/add-numpy-video-question origin/feat/add-numpy-video-question
```
# example:
# git checkout -b backup-feat/add-numpy-video-question origin/feat/add-numpy-video-question
```
4. Start off with a clean slate:
3. Start off with a clean slate:
```console
git checkout -b <pr-branch-name> next-python-projects
git cherry-pick <commit-hash>
```
5. Resolve any conflicts, and cleanup, install run tests
4. Resolve any conflicts, and cleanup, install run tests
```console
npm run clean
@@ -176,7 +176,7 @@ When you are working on features for our upcoming curriculum `next-*` branches,
```
6. If everything looks good push back to the PR
5. If everything looks good push back to the PR
```console
git push --force origin <pr-branch-name>