• State Resolved
  • Locked Locked
  • Replies 5 replies
  • Subscribers 54 subscribers
  • Views 607 views
  • Users 0 members are here
Support feedback
Options
Options
Related

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.

pushing the project to GIT with resolving conflicting linked files

Kacper Machaj
Prodigy 140 points

We have an old project in the company at a colleague's computer. Due to the transition to a newer processor, we wanted to work on the project together using GIT.

The old project has some files in a linked form, in order to transfer it properly to another computer we need to export it with the link conflict resolution option checked. Is there such an option if we want to use GIT?

  • 0
    TI__Guru**** 481001 points

    Hello

    Kacper Machaj said:
    we need to export it with the link conflict resolution option checked

    I'm not sure I understand this option. Can you provide more details?

    Thanks

    ki

  • 0 in reply to Ki
    Prodigy 140 points

    I was referring to this option. I have some of the files in the project as links. And with this option I can give the project to a colleague without worrying about these files.

    Is there such option somewhere in GIT functionality? Or is there any wizard which could replace all linked files in a project with a copy of the file in the whole project?

  • 0 in reply to Kacper Machaj
    TI__Guru**** 481001 points
    Kacper Machaj said:
    I was referring to this option. I have some of the files in the project as links. And with this option I can give the project to a colleague without worrying about these files.

    Note that when this option is enabled, CCS will resolve all linked files and add a copy of them to the root project folder location before exporting the project archive. Information on the links is lost in the exported project archive. Importing this exported archive will have the prviously linked files simply added to the root project location. 

    So yes, the benefit of this option is that you can give the project archive to a colleague with all source files (linked or not linked) as part of the archive. But the original directory structure of the previously linked files are lost. This can break the build of the project in some cases if the project is dependent on a specific direcctory structure.

    Is this still desirable?

  • 0 in reply to Ki
    Prodigy 140 points

    Yes, I was wondering if there is a feature somewhere for GIT repositories to automatically replace all linked files when pushed.

  • +1 in reply to Kacper Machaj
    TI__Guru**** 481001 points

    I am not aware of such functionality.