Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix inference docs #9305

Merged
merged 5 commits into from
Nov 14, 2022
Merged

fix inference docs #9305

merged 5 commits into from
Nov 14, 2022

Conversation

sanbuphy
Copy link
Contributor

Thanks for your contribution and we appreciate it a lot. The following instructions would make your pull request more healthy and more easily get feedback. If you do not understand some items, don't worry, just make the pull request and seek help from maintainers.

Motivation

Please describe the motivation of this PR and the goal you want to achieve through this PR.

Modification

Please briefly describe what modification is made in this PR.

BC-breaking (Optional)

Does the modification introduce changes that break the backward-compatibility of the downstream repos?
If so, please describe how it breaks the compatibility and how the downstream projects should modify their code to keep compatibility with this PR.

Use cases (Optional)

If this PR introduces a new feature, it is better to list some use cases here, and update the documentation.

Checklist

  1. Pre-commit or other linting tools are used to fix the potential lint issues.
  2. The modification is covered by complete unit tests. If not, please add more unit test to ensure the correctness.
  3. If the modification has potential influence on downstream projects, this PR should be tested with downstream projects, like MMDet or MMCls.
  4. The documentation has been modified accordingly, like docstring or example tutorials.

@ZwwWayne
Copy link
Collaborator

Hi @sanbuphy ,

Thanks for your kind PR. It seems that your branch is out of date and causes much difference.

Now, we require all the PRs to be merged into the development branch, i.e., dev branch for MMDet 2.x and dev-3.x branch for MMDet 3.x.

If your modification is not checkout from these two branches, they may cause conflicts and you should add your modification based on these two branches.

If your modification is checkout from these two branches, your branch might be out of date. In such a case
Please rebase your branch to the target dev or dev-3.x branch. You can simply do that by modifying your pull behavior:

git config --local --add pull.rebase true  # make rebase a default behavior in pull

Then you can git pull and rebase the dev branch by

git pull dev-3.x  # if your modification is for MMDet 3.x
git pull dev  # if your modification is for MMDet 2.x

After rebase, you might need to add --force option when pushing code, e.g.,

git push [remote name] [you branch] --force

@sanbuphy
Copy link
Contributor Author

Hi @sanbuphy ,

Thanks for your kind PR. It seems that your branch is out of date and causes much difference.

Now, we require all the PRs to be merged into the development branch, i.e., dev branch for MMDet 2.x and dev-3.x branch for MMDet 3.x.

If your modification is not checkout from these two branches, they may cause conflicts and you should add your modification based on these two branches.

If your modification is checkout from these two branches, your branch might be out of date. In such a case Please rebase your branch to the target dev or dev-3.x branch. You can simply do that by modifying your pull behavior:

git config --local --add pull.rebase true  # make rebase a default behavior in pull

Then you can git pull and rebase the dev branch by

git pull dev-3.x  # if your modification is for MMDet 3.x
git pull dev  # if your modification is for MMDet 2.x

After rebase, you might need to add --force option when pushing code, e.g.,

git push [remote name] [you branch] --force

Thank you, I have solved the problem.

@ZwwWayne ZwwWayne merged commit e0a4f4a into open-mmlab:dev-3.x Nov 14, 2022
@sanbuphy sanbuphy deleted the demobranch branch November 14, 2022 06:01
@ZwwWayne ZwwWayne added this to the 3.0.0rc4 milestone Nov 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants