• State Resolved
  • Locked Locked
  • Replies 4 replies
  • Subscribers 54 subscribers
  • Views 354 views
  • Users 0 members are here
Support feedback
Options
Options
Similar topics

This thread has been locked.

If you have a related question, please click the "Ask a related question" button in the top right corner. The newly created question will be automatically linked to this question.

Original question:

CCS/TMS320F28388D: Multiple CCS projects in one Git repository?

CODECOMPOSER: Is it possible to store different CCS projects in separate git branches for a single git repository?

Austin Fisher
Prodigy 20 points
Part Number: CODECOMPOSER

I have a few different CCS projects for various components that are a part of the same system. I would like to keep them all in a single repository since they're all parts of a larger single project. Ideally I would like to be able to merge all of the individual branches into a develop branch then merge the develop branch into main for major releases. Is this possible or should I just store all CCS projects in separate directories on a single branch?

  • 0
    TI__Guru**** 450031 points

    Hello Austin,

    Austin Fisher said:
    Is this possible or should I just store all CCS projects in separate directories on a single branch?

    I personally prefer the latter but it is a personal choice. I believe both options are supported when using CCS though I am hardly a power EGit user. Perhaps others can lend their insight to this thread.

    Thanks

    ki

  • 0
    Prodigy 20 points

    So far the issue I'm having with this is that when I switch branches it tries to keep the previous project directory active in the Working Set and it brings in the other project directory totally blank. I'm going to try experimenting with it a little more, but I think the solution might be to have different working sets for each branch. Another solution I'm going to look into is having multiple local repositories for each branch that all pull from the same remote repository.

  • 0 in reply to Austin Fisher
    TI__Guru**** 450031 points

    Please keep us posted on how it goes. I wish I had more experiece with EGit to provide more input. I'm wondering if the EGit UG has some info in there that could help?

  • +1 in reply to Ki
    Prodigy 20 points

    After some testing and playing around with merging and rebasing I've found that the thing that works the best for my situation is to create orphan branches for each project and to merge them into a develop branch then cherry pick a commit for a main release. To make this work in CCS I create one local repository for each branch and have it only track the remote branch that contains the project I'm interested in. This makes it so that I can have my working set look the same as it did before trying to keep every project in one remote repo. So now I have all my projects separate, but easy to work on while still being able to seamlessly push and pull from the same remote repo that they were cloned from.