Git : how to organize two projects that have common code

Question

How two organize two projects that have common part of code ?

I have 2 projects that have common part of code, that is being changed from time to time. I use TortoiseGit.

For example

project 1 - master
project 2 - dev-branch.

As I understand when I make changes in dev-branch (changes in specific dev-branch code and in common with master code) and then merge master with dev-branch, master will get also specific dev-branch code.

How do I resolve this situation to get, for master, only master specific changes?

I know, please see EDIT notion. But sometimes people from other areas can help too. — pvllnspk, Nov 26 '12 at 13:55
The fact that you know the tags are unrelated does not make it okay to add unrelated tags. People will see the question anyway. — Dietrich Epp, Nov 26 '12 at 14:03

score 4 · Accepted Answer · edited Mar 05 '14 at 05:02

You have to have an additional repository for the code you have in common. So in your case in total you'll have super-project1, super-project2, and a new sub-project repository.
For any of the files you want to be in the shared project, you must collect them into a special special sub directory (or tree) such that none of the super-project files are contained in the shared code directories.
After strict separation you can use Git's submodules or git-subtree (Use Case of subtree, identical to yours)

Máté · Answer 2 · 2013-05-15T07:58:15.037

1

you could use submodules for this

--edit correcting link

edited May 15 '13 at 07:58

answered Nov 26 '12 at 14:35

Máté

2,294
3
18
25

Link is dead - a submodule tutorial for the command line: https://git.wiki.kernel.org/index.php/GitSubmoduleTutorial - In TortoiseGit it's just right-click, Add Submodule. – Chris Moschini May 15 '13 at 01:25

score 1 · Answer 3 · answered Nov 26 '12 at 20:52

1

You can even have a git repo inside of a git repo, but you will end up 2 histories. I chose this option myself because I always change my inside git repo as a block since I want to update its unit tests whenever I update that repo.

answered Nov 26 '12 at 20:52

Mark Leighton Fisher

5,609
2
18
29

Git : how to organize two projects that have common code

3 Answers3