Skip to content

minor grammar edits#20447

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
snoyes:patch-1
Jul 23, 2021
Merged

minor grammar edits#20447
opencv-pushbot merged 1 commit intoopencv:3.4from
snoyes:patch-1

Conversation

@snoyes
Copy link
Copy Markdown
Contributor

@snoyes snoyes commented Jul 22, 2021

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • [N/A] There is reference to original bug report and related work
  • [N/A ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • [N/A] The feature is well documented and sample code can be built with the project CMake

@asmorkalov asmorkalov self-requested a review July 23, 2021 07:38
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Jul 23, 2021

Thanks for the fix! This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no need to re-open PR, apply changes "inplace".

@asmorkalov asmorkalov added the pr: needs rebase Rebase patch (and squash fixup commits) on the top of target branch label Jul 23, 2021
@snoyes snoyes changed the base branch from master to 3.4 July 23, 2021 13:09
@snoyes
Copy link
Copy Markdown
Contributor Author

snoyes commented Jul 23, 2021 via email

@asmorkalov asmorkalov removed the pr: needs rebase Rebase patch (and squash fixup commits) on the top of target branch label Jul 23, 2021
asmorkalov
asmorkalov approved these changes Jul 23, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@asmorkalov asmorkalov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! 👍

@opencv-pushbot opencv-pushbot merged commit 3bc3eeb into opencv:3.4 Jul 23, 2021
@snoyes snoyes deleted the patch-1 branch July 23, 2021 16:03
@alalek alalek mentioned this pull request Jul 24, 2021
Merged
@alalek alalek mentioned this pull request Oct 15, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@asmorkalov asmorkalov asmorkalov approved these changes

Assignees

@asmorkalov asmorkalov

Labels

category: documentation Documentation fix or update

Projects

None yet

Milestone

3.4.16

Development

Successfully merging this pull request may close these issues.

4 participants

@snoyes @asmorkalov @opencv-pushbot @alalek