Why wait 2-3 months to merge everything back into master? Why not do it every day? Or better yet, do it whenever a good bit of functionality (a story) is completed, which can be several times a day?
It's better to see where the dependencies are up front instead of waiting until the very end of the iteration.
Here's the ideal Git workflow, described by three different people but all pretty much recommending the same thing:
It's better to see where the dependencies are up front instead of waiting until the very end of the iteration.
Here's the ideal Git workflow, described by three different people but all pretty much recommending the same thing:
http://blog.hasmanythrough.com/2008/12/18/agile-git-and-the-...
http://gweezlebur.com/2009/01/19/my-git-workflow.html
http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-te...