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

doc: Clarify branching after Eigen discussion #37

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

130s
Copy link
Collaborator

@130s 130s commented Aug 16, 2022

In #33, a new direction to use Eigen is discussed for longer maintenance purpose. This PR attempts to update and clarify branching policy.

@130s 130s mentioned this pull request Aug 16, 2022
@130s
Copy link
Collaborator Author

130s commented Aug 16, 2022

I cannot assign but @cst0 @malban please review this PR along with #33 (comment).

[branch]: https://github.com/AndreaCensi/csm/tree/csm_eigen
- Main, development branch: [`master`][branch]. Note this uses `GSL`, which is licensed as GPL as of 2022/08.
- Another development branch: [`master_eigen`][branch]. This uses license permissible library `eigen`, instead of GSL.
- As of 2022/08/15, this branch is behind `master`. Cherry-picking effort for the newer changes that are only merged into `master` is appreciated.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I went through and looked at the differences between csm_eigen and master and only found the sm_icp_xy function to be missing, which has since been added to bring the branches into parity.

I see a few build related commits to the master branch only which I think are taken care of with #34.

So they should currently be at parity, but I agree with the comment that new changes should get cherry picked to both branches.

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.

2 participants