After reading this question on programmers.stackexchange, I realized that Solution 2 is clearly the best approach. Now the repository is structured like this:
|
+-- app/
|
+-- web/
|
+-- .gitignore
|
+-- README
The app/
and web/
folders contain the old repositories. I suggest reading the link above for a thorough explanation of the reasons why this approach is the best.