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

ete3 merge #45

Open
jhcepas opened this issue Aug 9, 2017 · 1 comment
Open

ete3 merge #45

jhcepas opened this issue Aug 9, 2017 · 1 comment
Assignees

Comments

@jhcepas
Copy link
Member

jhcepas commented Aug 9, 2017

Once all other issues are finish, specially the one regarding the structure of files, we will need to merge the repo into a new ete3 branch.

@unode has some experience on this and I (@jhcepas) can also help

@jhcepas jhcepas assigned fransua, unode, jhcepas and dpliakos and unassigned dpliakos Aug 9, 2017
@dpliakos
Copy link
Collaborator

dpliakos commented Dec 28, 2017

Hello!! It's been a bit of a time :)
We could do it using git submodules, in that case a "treematcher" directory is added
to the repo's root directory (path can be modified). The new directory is a reference to another repository whitch can be pulled, pushed,
rebased etc

Pros:

  • Keep treating treematcher as both complete and indipendent repo (history and github workflow for developement) and use git submodule COMMAND to handle it as submodule while using ete repo.
    COMMAND can be update, merge etc

Cons:

  • treematcher structure has to change so can be called as python -m ete3.treematcher .
  • documentation and tests has to be to a ete's corresponding directories.

Another approach with same results is the Git subtree merging. I do not quite understand the process to explain it.

pros and cons I believe are the same for both options, but they differ at the process.

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

No branches or pull requests

4 participants