On Thu, Jan 3, 2013 at 1:04 PM, Roy Stogner <royst...@ices.utexas.edu> wrote: > > (Cc:ing the PECOS local git expert) > > On Wed, 12 Dec 2012, Derek Gaston wrote: > >> Let's just move to Git and work in master for a little while and let >> everyone catch their breath... > > Although I am still very much mired in the "catching my breath" stage > (I'm still not certain under what-if-any conditions "rebase" is a good > idea, for example), I ran across a workflow description that might be
Rebase is useful for maintaining a linear revision history, like what we had with SVN. It's an alternative to doing periodic merges (as e.g. Ben did with his recent meshfree interpolation branch). But note that periodically rebasing a shared branch should probably be frowned upon, since that involves rewriting history (and push -f), and may affect others... It should also be possible to rebase a branch with a bunch of merge commits on top of master, and maintain a linear history, but I haven't attempted that thus far. > interesting to others: > > http://nvie.com/posts/a-successful-git-branching-model/ 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. -- John ------------------------------------------------------------------------------ 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-devel mailing list Libmesh-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/libmesh-devel
