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 master branch for release #44

Open
3 of 4 tasks
etsardou opened this issue Jul 12, 2016 · 6 comments
Open
3 of 4 tasks

Update master branch for release #44

etsardou opened this issue Jul 12, 2016 · 6 comments
Assignees
Labels

Comments

@etsardou
Copy link
Member

etsardou commented Jul 12, 2016

@alexge233
Copy link
Contributor

alexge233 commented Jul 13, 2016

@etsardou @dudekw I have rejected the pull request; there are major conflicts, and also some classes must be refactored by WUT.

@klpanagi
Copy link
Contributor

Proper README.md links exist on branch devel.

@alexge233
Copy link
Contributor

@etsardou and @klpanagi I've updated master with cpp branch, and merged cpp_dev on devel.
However, I personally think that master should have the cpp_dev / devel code since it has been extensively tested with unit tests and stress tests. Let me know if you want me to proceed with that.

@klpanagi
Copy link
Contributor

@alexge233, I really cannot read the git tree anymore...

You have made a direct merge to master (even a direct commit to master) and the tree has been broken. Even devel branch holds a direct commit!

devel branch holds both js and python development work and should be the one to merge into master.

If i understand correctly, devel CANNOT be merged to master because of conflicts in cpp implementations...

@alexge233
Copy link
Contributor

alexge233 commented Nov 21, 2016

Hi,

  1. Direct commit was a direct edit of README from github and removing some files which I didn't add (package.xml and CMakeLists.txt). The merge was from cpp which has been our long stable version (0.6.1)
  2. The devel branch has had cpp_dev merged because I'm removing it tomorrow (it was our own devel branch)
  3. Only file in conflict was README.md
  4. Any conflict in cpp implementation is solved by accepting devel (from cpp_dev) and ignoring master (if we are to move to 0.7.0)

alexge233 pushed a commit that referenced this issue Nov 22, 2016
klpanagi added a commit that referenced this issue Dec 13, 2016
klpanagi added a commit that referenced this issue Dec 13, 2016
@alexge233
Copy link
Contributor

C++ is merged and clear.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

4 participants