What s the best practice for putting multiple projects in a git repository

Question

As some reason  I only have one repository to use  But I have multiple projects including java projects  php scripts and Android apps projects     Now my problem is  I have to put them to different sub-folders inside the repository I use different IDEs  You know  each IDE can have a workspace of itself     Who can tell me a best practice to solve the problem

User · Answer

I would use git submodules   have a look here Git repository in a Git repository   As per February2019  I would suggest Monorepos   Lerna Bit

User · Answer

While most people will tell you to just use multiple repositories  I feel it s worth mentioning there are other solutions   Solution 1  A single repository can contain multiple independent branches  called orphan branches  Orphan branches are completely separate from each other  they do not share histories   git checkout --orphan BRANCHNAME   This creates a new branch  unrelated to your current branch  Each project should be in its own orphaned branch   Now for whatever reason  git needs a bit of cleanup after an orphan checkout   rm  git index rm -r     Make sure everything is committed before deleting  Once the orphan branch is clean  you can use it normally   Solution 2  Avoid all the hassle of orphan branches  Create two independent repositories  and push them to the same remote  Just use different branch names for each repo     repo 1 git push origin master master-1    repo 2 git push origin master master-2

User · Answer

Solution 3  This is for using a single directory for multiple projects  I use this technique for some closely related projects where I often need to pull changes from one project into another  It s similar to the orphaned branches idea but the branches don t need to be orphaned  Simply start all the projects from the same empty directory state   Start all projects from one committed empty directory  Don t expect wonders from this solution  As I see it  you are always going to have annoyances with untracked files  Git doesn t really have a clue what to do with them and so if there are intermediate files generated by a compiler and ignored by your  gitignore file  it is likely that they will be left hanging some of the time if you try rapidly swapping between - for example - your software project and a PH D thesis project   However here is the plan  Start as you ought to start any git projects  by committing the empty repository  and then start all your projects from the same empty directory state  That way you are certain that the two lots of files are fairly independent  Also  give your branches a proper name and don t lazily just use  master   Your projects need to be separate so give them appropriate names   Git commits  and hence tags and branches  basically store the state of a directory and its subdirectories and Git has no idea whether these are parts of the same or different projects so really there is no problem for git storing different projects in the same repository  The problem is then for you clearing up the untracked files from one project when using another  or separating the projects later   Create an empty repository  cd some empty directory git init touch  gitignore git add  gitignore git commit -m empty git tag EMPTY   Start your projects from empty   Work on one project   git branch software EMPTY git checkout software echo  array board 8 8  of piece   gt  chess prog  git add chess prog  git commit -m  chess program    Start another project  whenever you like   git branch thesis EMPTY git checkout thesis echo  the meaning of meaning   gt  philosophy doctorate txt git add philosophy doctorate txt  git commit -m  Ph D    Switch back and forth  Go back and forwards between projects whenever you like  This example goes back to the chess software project   git checkout software echo  while not end of game do make move     gt  gt  chess prog git add chess prog  git commit -m  improved chess program    Untracked files are annoying  You will however be annoyed by untracked files when swapping between projects branches   touch untracked software file prog git checkout thesis  ls     philosophy doctorate txt  untracked software file prog   It s not an insurmountable problem  Sort of by definition  git doesn t really know what to do with untracked files and it s up to you to deal with them  You can stop untracked files from being carried around from one branch to another as follows   git checkout EMPTY  ls     untracked software file prog rm -r        directory is now really empty  apart from the repository stuff   git checkout thesis ls     philosophy doctorate txt   By ensuring that the directory was empty before checking out our new project we made sure there were no hanging untracked files from another project   A refinement    GIT AUTHOR DATE  2001-01-01 T01 01 01  GIT COMMITTER DATE  2001-01-01T01 01 01  git commit -m empty   If the same dates are specified whenever committing an empty repository  then independently created empty repository commits can have the same SHA1 code  This allows two repositories to be created independently and then merged together into a single tree with a common root in one repository later   Example    Create thesis repository     Merge existing chess repository branch into it  mkdir single repo for thesis and chess cd single repo for thesis and chess git init touch  gitignore git add  gitignore GIT AUTHOR DATE  2001-01-01 T01 01 01  GIT COMMITTER DATE  2001-01-01 T01 01 01  git commit -m empty git tag EMPTY echo  the meaning of meaning   gt  thesis txt git add thesis txt git commit -m  Wrote my PH D  git branch -m master thesis    It s as simple as this     git remote add chess    chessrepository  git git fetch chess chess chess   Result    Use subdirectories per project   It may also help if you keep your projects in subdirectories where possible  e g  instead of having files  chess prog philosophy doctorate txt    have   chess chess prog thesis philosophy doctorate txt    In this case your untracked software file will be chess untracked software file prog  When working in the thesis directory you should not be disturbed by untracked chess program files  and you may find occasions when you can work happily without deleting untracked files from other projects   Also  if you want to remove untracked files from other projects  it will be quicker  and less prone to error  to dump an unwanted directory than to remove unwanted files by selecting each of them   Branch names can include     characters  So you might want to name your branches something like  project1 master project1 featureABC project2 master project2 featureXYZ

[git] What's the best practice for putting multiple projects in a git repository?

Examples related to git