search

squirrel-project / squirrel_planning

Repository for planning related SQUIRREL packages.
0 stars 8 forks source link

added scene object #49

Closed mzillich closed 8 years ago

ipa-nhg commented 8 years ago

@mzillich can you please merge with the actual squirrel-project/indigo_dev version?

mzillich commented 8 years ago

hm? it says: mzillich wants to merge 1 commit into squirrel-project:indigo_dev from mzillich:indigo_dev that should be correct, no?

ipa-nhg commented 8 years ago

No, I mean in the other direction . from squirrel-project:indigo_dev to mzillich:indigo_dev , your version is out of date.

I sent you a pull request: https://github.com/m312z/squirrel_planning/pull/23

m312z commented 8 years ago

Did you mean to send that pull request to @mzillich instead?

mzillich commented 8 years ago

ok, updated to current squirrel-project:indigo_dev

ipa-nhg commented 8 years ago

Thanks! buildbot was not able to test your pull request because you had an old version where the dependency to move_base_msgs was missed, and buildbot tries to compile the packages installing only the defined dependencies. After merge with the upstream you added the dependency and a new job was triggered.

Thanks a lot!

m312z commented 8 years ago

Also, pull requests should be made to the technical maintainer's fork, so that they can check and/or merge the code. The squirrel project is only the last stable version and is out of date itself.

mzillich commented 8 years ago

ah, sorry. will do.

ipa-nhg commented 8 years ago

Sorry I didn't know that the updated version was the technical maintainer's fork.

In the future I will send first the pull request to your fork. But please , try to update the squirrel-project branch as often as possible. The buildbot system is only analysing the squirrel-project repositories and the pull request made to squirrel-project.

Also, if you want we can create a separate stable branch and you can have push rights to merge pull requests. @m312z Let me know if it can help you or you have further suggestions

mzillich commented 8 years ago

@ipa-nhg can this be merged now?

ipa-nhg commented 8 years ago

From my point of view and buildbot, yes. But @m312z wants to use only his branch to merge pull requests.

m312z commented 8 years ago

Hello, yes -- I don't want to find that the latest version of squirrel_planning we are working on has diverged from the base repository. That is, I would like a chance to merge changes to squirrel_planning into our fork.

I've already done this for this commit. I will make a request from my fork.

m312z commented 8 years ago

I've done so: #50 Thanks for all.

ipa-nhg commented 8 years ago

Perfect, I will take a look , than this pull request (#49) will be automatically merged Thanks!