On Thu, Jan 3, 2013 at 1:58 PM, John Peterson <[email protected]> wrote:
> I looked at this diagram for a while, and I like it, other than I > probably wouldn't make such a big distinction between the yellow and > green dots... > > Feature (pink) branches periodically merge into develop, every once in > a while develop is merged into master as a "tagged" release. > Right - I view the "pink" branches as our own branches in our own libMesh forks. The "develop" branch will hopefully be the "devel" branch in the libMesh repo we've been talking about. I wouldn't mess around with a "hotfix" branch at all. If a particular bugfix needs to get merged from "devel" to master then I would just go to the master branch and use "cherry-pick" to pull over a patch from devel like so: git cherry-pick 3ea9861 Where "3ea9861" is the beginning of the hash for the patch in "devel" that you want to pull over to master. That will take a patch from "devel" and stack it on top of master. Git is smart enough so that when you do the (eventual) merge from devel to master it will recognize that the same patch is there twice and do the right thing. Derek ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnmore_122712 _______________________________________________ Libmesh-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/libmesh-users
