Skip to content

Fix a typo in python doc#15335

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
lixit:master
Aug 20, 2019
Merged

Fix a typo in python doc#15335
opencv-pushbot merged 1 commit intoopencv:3.4from
lixit:master

Conversation

@lixit
Copy link
Copy Markdown
Contributor

@lixit lixit commented Aug 19, 2019

Fix a typo in python doc

@alalek
Copy link
Copy Markdown
Member

alalek commented Aug 19, 2019

It is not a typo.
This is a difference between Python 2.7 / Python 3.x.

Bugfixes 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".

@lixit lixit changed the base branch from master to 3.4 August 20, 2019 03:08
opencv-pushbot pushed a commit that referenced this pull request Aug 20, 2019
@opencv-pushbot opencv-pushbot merged commit b1a5c76 into opencv:3.4 Aug 20, 2019
@alalek alalek mentioned this pull request Aug 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category: documentation Documentation fix or update

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants