Skip to content

Fixed mismatch#2035

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
kyscg:fix-mismatch
Apr 30, 2020
Merged

Fixed mismatch#2035
opencv-pushbot merged 1 commit intoopencv:3.4from
kyscg:fix-mismatch

Conversation

@kyscg
Copy link
Copy Markdown
Contributor

@kyscg kyscg commented Mar 12, 2019

This is in regard to #1970

I've completed the initial part and I think we now have to change the code, could I have some pointers on how to go about changing the code and subsequent document updation??

Review pleasee?? @alalek @LaurentBerger

@alalek
Copy link
Copy Markdown
Member

alalek commented Mar 13, 2019

As a bugfix 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".

@kyscg kyscg changed the base branch from master to 3.4 March 14, 2019 11:54
@alalek
Copy link
Copy Markdown
Member

alalek commented Mar 19, 2019

@kyscg Please rebase this patch again on the HEAD of "3.4" branch (to resolve conflicts). Thank you!

@asmorkalov asmorkalov self-requested a review April 29, 2020 13:24
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.

👍

@kyscg
Copy link
Copy Markdown
Contributor Author

kyscg commented Apr 30, 2020

Thanks for the review, is this ready to merge?

@opencv-pushbot opencv-pushbot merged commit 3496967 into opencv:3.4 Apr 30, 2020
@alalek alalek mentioned this pull request May 6, 2020
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, does not affect code category: ximgproc

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants