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

Update 'bbox_head' to align with new config files #653

Open
wants to merge 11 commits into
base: dev-1.x
Choose a base branch
from

Conversation

jistiak
Copy link
Contributor

@jistiak jistiak commented Dec 2, 2022

In the new version of the config files, the 'bbox_head' dict is inside 'roi_head'. If one follows the old documentation, it results in this following issue -

#607

This way 'bbox_head' is not repeated and the error is solved.

yangxue0827 and others added 11 commits October 27, 2022 16:44
* Update __init__.py

* update mmcv

* Update __init__.py
* Update build.yml

* update

* Create config.yml

* fix circleCI

* fix lint

* fix sphinx_markdown_tables

* update

* Update test.yml
In the new version of the config files, the 'bbox_head' dict is inside 'roi_head'. If one follows the old documentation, it results in this following issue - 

open-mmlab#607

This way 'bbox_head' is not repeated and the error is solved.
@zytx121 zytx121 changed the base branch from main to dev-1.x December 3, 2022 00:24
@zytx121
Copy link
Collaborator

zytx121 commented Dec 3, 2022

Hi @jistiak,
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 MMRotate 0.x and dev-1.x branch for MMRotate 1.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-1.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-1.x  # if your modification is for MMRotate 1.x
git pull dev  # if your modification is for MMRotate 0.x

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

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

@CLAassistant
Copy link

CLAassistant commented Mar 2, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 5 committers have signed the CLA.

✅ RangiLyu
✅ zytx121
❌ MinkiSong
❌ yangxue0827
❌ jistiak
You have signed the CLA already but the status is still pending? Let us recheck it.

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