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 include path so that <bolero/mars_environment/MARSEnvironment.h> … #123

Open
wants to merge 3 commits into
base: distribution
Choose a base branch
from

Conversation

2maz
Copy link
Contributor

@2maz 2maz commented Sep 15, 2021

…include works

Testing with an autoproj separate prefix installation

…include works

Testing with an autoproj separate prefix installation
@2maz 2maz requested a review from malter September 15, 2021 09:55
@AlexanderFabisch
Copy link
Contributor

could you rebase on #122?

m0rsch1 and others added 2 commits September 17, 2021 10:04
Signed-off-by: Moritz Schilling <[email protected]>
Otherwise #include <bolero/Behavior.h> will only accidentially work
@AlexanderFabisch
Copy link
Contributor

@maotto @malter OK, this Pull Request tries to merge into the branch distribution (as pointed out in #124 ), why is it the case? Is the branch used in any build configuration?

@malter
Copy link
Member

malter commented Dec 15, 2021

It is used in the Q-Rock stack. I will check what is going on.

@AlexanderFabisch
Copy link
Contributor

AlexanderFabisch commented Dec 15, 2021

I'll set master as the new target branch for this.

edit: sorry, not a good idea, what I actually want to do is cherry-pick the last commit on push it to master so that you can rebase distribution on master

@AlexanderFabisch AlexanderFabisch changed the base branch from distribution to master December 15, 2021 13:46
@AlexanderFabisch AlexanderFabisch changed the base branch from master to distribution December 15, 2021 13:46
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.

4 participants