Skip to content

js setup docker build warning and docs instructions#15476

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
cancerberoSgx:js-docker
Sep 13, 2019
Merged

js setup docker build warning and docs instructions#15476
opencv-pushbot merged 1 commit intoopencv:3.4from
cancerberoSgx:js-docker

Conversation

@cancerberoSgx
Copy link
Copy Markdown
Contributor

@cancerberoSgx cancerberoSgx commented Sep 6, 2019

@alalek
Copy link
Copy Markdown
Member

alalek commented Sep 6, 2019

Please change target of this PR onto 3.4 branch + rebase

@cancerberoSgx cancerberoSgx changed the base branch from master to 3.4 September 6, 2019 17:48
@cancerberoSgx
Copy link
Copy Markdown
Contributor Author

cancerberoSgx commented Sep 6, 2019

I'm creating a new PR from 3.4 branch and closing this one . Thanks

@alalek
Copy link
Copy Markdown
Member

alalek commented Sep 6, 2019

Instruction is below:

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

@cancerberoSgx
Copy link
Copy Markdown
Contributor Author

cancerberoSgx commented Sep 6, 2019

@alalek thanks for the instructions! I think it's done.

alalek
alalek approved these changes Sep 13, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Thank you!

opencv-pushbot pushed a commit that referenced this pull request Sep 13, 2019
@alalek
Merge pull request #15476 from cancerberoSgx:js-docker
f5f9187
@opencv-pushbot opencv-pushbot merged commit a17231a into opencv:3.4 Sep 13, 2019
@alalek alalek mentioned this pull request Sep 13, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: documentation Documentation fix or update category: javascript (js)

Projects

None yet

Milestone

3.4.8

Development

Successfully merging this pull request may close these issues.

3 participants

@cancerberoSgx @alalek @opencv-pushbot