Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Shared Library in repository with visual studio

I'm new to Git version control. I just want each project to have its own repository.

I created

  1. A Project(Shared Lib) in RepoA
  2. B Project(Shared Lib) in RepoB that has subtree of A
  3. C Project(Shared Lib) in RepoC that has subtree of A
  4. D Project(Console Application) in RepoD that has subtree of B and C

the folder structure is like below.

D

-B

--A

-C

--A

As you can see, A folder is duplicated, and I can't add the same project twice in visual studio.

If I add A project in B folder, the compile error occurs.

Metadata file project C..... 'A.dll' could not be found Because A project in C folder, never been compile, A.dll is missing.

If A in C project is compiled once, it works fine.(by opening Either C.sln or A.sln in C project) Of course, there would be A.dll,

but next time someone else download D project from git, he/she should compile C or A in C project before compile D project.

Anyone has a good solution for this?

like image 667
Han Eui-Jun Avatar asked Mar 29 '16 21:03

Han Eui-Jun


1 Answers

You can try and read about submodules.

Submodules allow foreign repositories to be embedded within a dedicated subdirectory of the source tree, always pointed at a particular commit.


git submodule

Break your big project to sub projects as you did so far.
Now add each sub project to you main project using :

git submodule add <url>

Once the projected is added tot your repo you have to init and update it.

git submodule init
git submodule update

As of Git 1.8.2 new option --remote was added

git submodule update --remote --merge

will fetch the latest changes from upstream in each submodule, merge them in, and check out the latest revision of the submodule.

As the docs describe it:

--remote

This option is only valid for the update command. Instead of using the superproject’s recorded SHA-1 to update the submodule, use the status of the submodule’s remote-tracking branch.

This is equivalent to running git pull in each submodule.


However, how would I push a commit in the scenario of bug fix in C which affects the code shared with the parent layers?

Again: using submodule will place your code inside your main project as part of its content. The difference between having it locally inside the folder or having it as part of a submodule is that in submodule the content is managed (commited) to a different standalone repository.


This is an illustration of submodule - project inside another project in which each project is a standalone project.

enter image description here


git subtree

Git subtree allows you to insert any repository as a sub-directory of another one

Very similar to submodule but the main difference is where your code is managed. In submodules the content is placed inside a separate repo and is managed there which allow you to clone it to many other repos as well.

subtree is managing the content as part of the root project and not in a separate project.

Instead of writing down how to set it up and to understand how to use it you can simply read this excellent post which will explain it all.

https://developer.atlassian.com/blog/2015/05/the-power-of-git-subtree/

like image 165
CodeWizard Avatar answered Sep 17 '22 15:09

CodeWizard