Skip to content

Important single character fix#17299

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
tweenietomatoes:patch-1
May 15, 2020
Merged

Important single character fix#17299
opencv-pushbot merged 1 commit intoopencv:3.4from
tweenietomatoes:patch-1

Conversation

@tweenietomatoes
Copy link
Copy Markdown
Contributor

@tweenietomatoes tweenietomatoes commented May 15, 2020

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 OpenCV (BSD) 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
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@alalek
Copy link
Copy Markdown
Member

alalek commented May 15, 2020

Thank you for catching this!

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 needs to re-open PR, apply changes "inplace".

@tweenietomatoes tweenietomatoes changed the base branch from master to 3.4 May 15, 2020 11:11
@tweenietomatoes
Copy link
Copy Markdown
Contributor Author

done i guess.

@mshabunin
Copy link
Copy Markdown
Contributor

Looks like rebase goes wrong... Try the following:

git checkout patch-1 -B patch-1-backup

git fetch https://github.com/opencv/opencv 3.4:3.4
git checkout 3.4 -B patch-1
git cherry-pick 9b9aa3d
git push -f origin patch-1:patch-1

git branch -D patch-1-backup

@tweenietomatoes
Copy link
Copy Markdown
Contributor Author

:D

@mshabunin mshabunin self-assigned this May 15, 2020
@tweenietomatoes
Copy link
Copy Markdown
Contributor Author

without this patch i wonder what would be

@opencv-pushbot opencv-pushbot merged commit 753e417 into opencv:3.4 May 15, 2020
@alalek alalek mentioned this pull request May 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants