Zhiqiang Wang commited on
Commit
3d89798
Β·
unverified Β·
1 Parent(s): fee83c1

Small fixes to docstrings (#5313)

Browse files

* Minor fixes of the git checkout new branch

* Use em dash to quote

* Revert the change of git checkout

* Maybe we should up-to-date with the upstream/master?

.github/workflows/greetings.yml CHANGED
@@ -13,7 +13,7 @@ jobs:
13
  repo-token: ${{ secrets.GITHUB_TOKEN }}
14
  pr-message: |
15
  πŸ‘‹ Hello @${{ github.actor }}, thank you for submitting a πŸš€ PR! To allow your work to be integrated as seamlessly as possible, we advise you to:
16
- - βœ… Verify your PR is **up-to-date with origin/master.** If your PR is behind origin/master an automatic [GitHub actions](https://github.com/ultralytics/yolov5/blob/master/.github/workflows/rebase.yml) rebase may be attempted by including the /rebase command in a comment body, or by running the following code, replacing 'feature' with the name of your local branch:
17
  ```bash
18
  git remote add upstream https://github.com/ultralytics/yolov5.git
19
  git fetch upstream
 
13
  repo-token: ${{ secrets.GITHUB_TOKEN }}
14
  pr-message: |
15
  πŸ‘‹ Hello @${{ github.actor }}, thank you for submitting a πŸš€ PR! To allow your work to be integrated as seamlessly as possible, we advise you to:
16
+ - βœ… Verify your PR is **up-to-date with upstream/master.** If your PR is behind upstream/master an automatic [GitHub actions](https://github.com/ultralytics/yolov5/blob/master/.github/workflows/rebase.yml) rebase may be attempted by including the /rebase command in a comment body, or by running the following code, replacing 'feature' with the name of your local branch:
17
  ```bash
18
  git remote add upstream https://github.com/ultralytics/yolov5.git
19
  git fetch upstream
CONTRIBUTING.md CHANGED
@@ -41,22 +41,22 @@ changes** button. All done, your PR is now submitted to YOLOv5 for review and ap
41
 
42
  To allow your work to be integrated as seamlessly as possible, we advise you to:
43
 
44
- - βœ… Verify your PR is **up-to-date with origin/master.** If your PR is behind origin/master an
45
  automatic [GitHub actions](https://github.com/ultralytics/yolov5/blob/master/.github/workflows/rebase.yml) rebase may
46
  be attempted by including the /rebase command in a comment body, or by running the following code, replacing 'feature'
47
  with the name of your local branch:
48
 
49
- ```bash
50
- git remote add upstream https://github.com/ultralytics/yolov5.git
51
- git fetch upstream
52
- git checkout feature # <----- replace 'feature' with local branch name
53
- git merge upstream/master
54
- git push -u origin -f
55
- ```
56
 
57
  - βœ… Verify all Continuous Integration (CI) **checks are passing**.
58
  - βœ… Reduce changes to the absolute **minimum** required for your bug fix or feature addition. _"It is not daily increase
59
- but daily decrease, hack away the unessential. The closer to the source, the less wastage there is."_ -Bruce Lee
60
 
61
  ## Submitting a Bug Report πŸ›
62
 
 
41
 
42
  To allow your work to be integrated as seamlessly as possible, we advise you to:
43
 
44
+ - βœ… Verify your PR is **up-to-date with upstream/master.** If your PR is behind upstream/master an
45
  automatic [GitHub actions](https://github.com/ultralytics/yolov5/blob/master/.github/workflows/rebase.yml) rebase may
46
  be attempted by including the /rebase command in a comment body, or by running the following code, replacing 'feature'
47
  with the name of your local branch:
48
 
49
+ ```bash
50
+ git remote add upstream https://github.com/ultralytics/yolov5.git
51
+ git fetch upstream
52
+ git checkout feature # <----- replace 'feature' with local branch name
53
+ git merge upstream/master
54
+ git push -u origin -f
55
+ ```
56
 
57
  - βœ… Verify all Continuous Integration (CI) **checks are passing**.
58
  - βœ… Reduce changes to the absolute **minimum** required for your bug fix or feature addition. _"It is not daily increase
59
+ but daily decrease, hack away the unessential. The closer to the source, the less wastage there is."_ β€” Bruce Lee
60
 
61
  ## Submitting a Bug Report πŸ›
62