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

Porting stm32f4_disco on dashing #20

Open
wants to merge 4 commits into
base: foxy
Choose a base branch
from

Conversation

RaKalel
Copy link

@RaKalel RaKalel commented Aug 7, 2020

As per my conversation with @pablogs9.

@ralph-lange
Copy link
Contributor

Thank you very much for this contribution, @RaKalel. May I please ask you to document the included 3rd-party source-code in 3rd-party-licenses.txt as part of this pull request?

@RaKalel
Copy link
Author

RaKalel commented Aug 7, 2020

Hi @ralph-lange , so you want me to add the the third part source code like in the foxy branch to my branch (stm32 code licence) ? Once again I am sorry for these questions I am quite new to this.

@ralph-lange
Copy link
Contributor

ralph-lange commented Aug 7, 2020

I was not aware that the branch of this PR was created before 3rd-party-licenses.txt has been introduced. I'm sorry! This will lead to a conflict. In this case it is probably the best if you undo the last commit (git reset --soft HEAD~1), delete the 3rd-party-licenses.txt, and force re-push the branch without this commit (git push --force ...). Then, we merge your PR and kindly ask you to provide the details on the included third-party software in a second PR, please. I'll restructure the 3rd-party-licenses.txt file in the meanwhile (cf. PR #21) so that you will know exactly where to put this information.

@ralph-lange
Copy link
Contributor

@RaKalel, in the second PR mentioned above, also please add your name to the NOTICE file (cf. CONTRIBUTING.md).

@pablogs9
Copy link
Member

pablogs9 commented Aug 7, 2020

I'll check and test this port after the summer holidays. And I'll integrate it here and in the build system.

@ralph-lange
Copy link
Contributor

I'll check and test this port after the summer holidays. And I'll integrate it here and in the build system.

@RaKalel, given this delay (@pablogs9 has really earned his vacation!), you may consider to even rebase the PR with respect to the recent changes on the default branch foxy, i.e. undo the last commit as described above, pull the foxy branch, rebase your branch, add the license information to 3rd-party-licenses.txt and add your name to the NOTICE file. See https://stackoverflow.com/a/7929473 for an more detailed explanation on the procedure.

@RaKalel
Copy link
Author

RaKalel commented Aug 7, 2020

So I undid my last commit and removed the third party licenses.txt. So now do I create a new pull request with the foxy branch as as the base? (I am afraid that I will create a big mess for you guys )

I tryed rebasing my branch as per stackoverflow.

@ralph-lange
Copy link
Contributor

Thank you for your reply, @RaKalel. Unfortunately, the rebasing did not work properly. The following sequence clones the original repo, than adds your fork as second origin and rebases your work on top of the latest foxy branch without the last commit. Everything is stored in a new branch, which can be either pushed as new branch or be used to overwrite the existing branch:

git clone https://github.com/micro-ROS/freertos_apps.git
cd freertos_apps/
git remote add origin-fork https://github.com/RaKalel/freertos_apps.git
git pull origin-fork 
git checkout a5c8feb
git checkout -b stm32f4_disco_new
git rebase foxy
git push -f origin-fork stm32f4_disco_new 

Can you give this sequence a try, please?

@RaKalel
Copy link
Author

RaKalel commented Aug 12, 2020

HI @ralph-lange , thanks for your instructions. I followed them and now I have a new branch "stm32f4_disco_new". So do I need to redo a PR from the new branch or do I overwrite the old 'stm32f4_disco' ?

@ralph-lange
Copy link
Contributor

You can overwrite the existing remote branch by git push -f origin-fork stm32f4_disco_new:stm32f4_disco, cf. https://stackoverflow.com/questions/5738797/how-can-i-push-a-local-git-branch-to-a-remote-with-a-different-name-easily

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.

3 participants