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

Help for pull request #11073

Closed
tuloski opened this issue Dec 19, 2018 · 2 comments
Closed

Help for pull request #11073

tuloski opened this issue Dec 19, 2018 · 2 comments

Comments

@tuloski
Copy link

tuloski commented Dec 19, 2018

I added a new feature to EKF2.
The problem is that it requires both modifications to PX4/Firmware, but also to lib/ecl/EKF.
How is the correct protocol for pull request in both main firmware and submodules?
I have my fork and I can pull request for PX4/Firmware, but how to include the submodule? Do I need separate fork with separate pull request? What if the pull request is accepted in one and not in the other (the code won't compile)?

@dagar
Copy link
Member

dagar commented Dec 19, 2018

Hi @tuloski

Open the pull request on https://github.com/PX4/ecl, if it requires a corresponding PX4/Firmware change open a simultaneous PR with the submodule temporarily changed to your own fork. Make it clear in both PRs that they're dependent and we'll review and test them together. Once accepted we merge PX4/ecl, then immediately update the PX4/Firmware PR to point to the new ecl master and merge.

This is the worst case when changes are required on both sides. In many cases the changes can actually go in separately.

@dagar dagar closed this as completed Dec 19, 2018
@tuloski
Copy link
Author

tuloski commented Dec 19, 2018

Ok perfect I'll do that.
But before I need to fix #11072 because idk if it is my issue in the code or a problem with QGC.

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

No branches or pull requests

2 participants